code clean-up
Merge pull request #205 from csoroiu/master

code clean-up
Merge branch 'master' into jdk6backport(android)