Merge branch 'master' of https://github.com/puppetnix/jdk1.7
Merge branch 'master' of https://github.com/puppetnix/jdk1.7