importing java revision
Merge branch 'master' of https://github.com/davidhagan/java