Added tag jdk7u40-b36 for changeset 9a85d57b3679
Merge jdk7u25-b34 into jdk7u40-b36