commit 2
Merge https://github.com/jcimoch/jdbc3