# HG changeset patch
# User tbell
# Date 1249022479 25200
# Node ID 95c1212b07e33b1b8c689b1d279d82ffd5a56e43
# Parent  e4ce529b2249f108c24fa7e96e6e7790a30d3c1f# Parent  689bec60a482efd511cc0b45ad046c4f993c04fc
Merge

diff -r e4ce529b2249 -r 95c1212b07e3 .hgtags
--- a/.hgtags	Mon Jul 27 23:07:00 2009 -0700
+++ b/.hgtags	Thu Jul 30 23:41:19 2009 -0700
@@ -41,3 +41,4 @@
 d8f23a81d46f47a4186f1044dd9e44841bbeab84 jdk7-b64
 7e0056ded28c802609d2bd79bfcda551d72a3fec jdk7-b65
 634f519d6f9a602b16bba1c7cd4a17242a8f6889 jdk7-b66
+14b1a8ede95493fc53c37ff2626f1f98ce94d108 jdk7-b67
diff -r e4ce529b2249 -r 95c1212b07e3 src/share/classes/com/sun/tools/javac/code/TypeAnnotationPosition.java
--- a/src/share/classes/com/sun/tools/javac/code/TypeAnnotationPosition.java	Mon Jul 27 23:07:00 2009 -0700
+++ b/src/share/classes/com/sun/tools/javac/code/TypeAnnotationPosition.java	Thu Jul 30 23:41:19 2009 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2003-2009 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff -r e4ce529b2249 -r 95c1212b07e3 src/share/classes/com/sun/tools/javac/comp/Lower.java
--- a/src/share/classes/com/sun/tools/javac/comp/Lower.java	Mon Jul 27 23:07:00 2009 -0700
+++ b/src/share/classes/com/sun/tools/javac/comp/Lower.java	Thu Jul 30 23:41:19 2009 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1999-2009 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff -r e4ce529b2249 -r 95c1212b07e3 src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java
--- a/src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java	Mon Jul 27 23:07:00 2009 -0700
+++ b/src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java	Thu Jul 30 23:41:19 2009 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1999-2009 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff -r e4ce529b2249 -r 95c1212b07e3 src/share/classes/com/sun/tools/javac/jvm/Code.java
--- a/src/share/classes/com/sun/tools/javac/jvm/Code.java	Mon Jul 27 23:07:00 2009 -0700
+++ b/src/share/classes/com/sun/tools/javac/jvm/Code.java	Thu Jul 30 23:41:19 2009 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1999-2009 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff -r e4ce529b2249 -r 95c1212b07e3 src/share/classes/com/sun/tools/javac/jvm/Gen.java
--- a/src/share/classes/com/sun/tools/javac/jvm/Gen.java	Mon Jul 27 23:07:00 2009 -0700
+++ b/src/share/classes/com/sun/tools/javac/jvm/Gen.java	Thu Jul 30 23:41:19 2009 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1999-2009 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff -r e4ce529b2249 -r 95c1212b07e3 src/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java
--- a/src/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java	Mon Jul 27 23:07:00 2009 -0700
+++ b/src/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java	Thu Jul 30 23:41:19 2009 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2009 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff -r e4ce529b2249 -r 95c1212b07e3 src/share/classes/com/sun/tools/javac/resources/legacy.properties
--- a/src/share/classes/com/sun/tools/javac/resources/legacy.properties	Mon Jul 27 23:07:00 2009 -0700
+++ b/src/share/classes/com/sun/tools/javac/resources/legacy.properties	Thu Jul 30 23:41:19 2009 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright 2006-2007 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright 2006-2009 Sun Microsystems, Inc.  All Rights Reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
diff -r e4ce529b2249 -r 95c1212b07e3 test/tools/javac/typeAnnotations/failures/OldArray.java
--- a/test/tools/javac/typeAnnotations/failures/OldArray.java	Mon Jul 27 23:07:00 2009 -0700
+++ b/test/tools/javac/typeAnnotations/failures/OldArray.java	Thu Jul 30 23:41:19 2009 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2008-2009 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it