Merge jdk7-b140

Merge

7032975: API files in javax.annotation.processing need to be updated for references to JLS

7034019: ClassCastException in javac with conjunction types

7034511: Loophole in typesafety

7033809: Rename "disjunctive" to "union" in javax.lang.model

Added tag jdk7-b139 for changeset 853b6bb99f9b

Added tag jdk7-b138 for changeset 53f212bed4f4 jdk7-b139

Merge jdk7-b138

Merge

(0) -300 -100 -10 +10 +100 +300 +1000 tip

mercurial