JDK 1.6 support.
Merge branch 'master' of github.com:junkdog/agrotera