Merge jdk7u6-b05 into jdk7u6-b06