Added tag jdk7-b42 for changeset caf58ffa0845
Merge