A few code style changes to keep in sync with the mainline code.
A few code style changes to keep in sync with the mainline code.
Merge branch 'master' into jdk7