# HG changeset patch
# User andrew
# Date 1324567211 0
# Node ID 7300d2ab9fb2068250a96ca4afc481c4beb6a42b
# Parent  948e734135eab3c6d574e1cedfa021be194ff4bd# Parent  a9ac11158b8f49d3fcc8e2a3b95fc7b22eb4bd26
Merge

diff -r 948e734135ea -r 7300d2ab9fb2 .hgtags
--- a/.hgtags	Wed Sep 28 23:12:50 2011 +0100
+++ b/.hgtags	Thu Dec 22 15:20:11 2011 +0000
@@ -124,5 +124,24 @@
 39bf6dcaab2336326b21743cef7042d0a2de9ba0 jdk7-b144
 10ca7570f47f2ae4132648f7e8da1a05f1a98a15 jdk7-b145
 bcd31fa1e3c6f51b4fdd427ef905188cdac57164 jdk7-b146
+067fb18071e3872698f6218724958bd0cebf30a3 jdk7u1-b01
 fc268cd1dd5d2e903ccd4b0275e1f9c2461ed30c jdk7-b147
 b8d01501956a0d41f5587ff1bebbfe5a9b8fea5a icedtea-2.0-branchpoint
+104ca42e1e7ca66b074a4619ce6420f15d8f454d jdk7u1-b02
+64e323faadf65018c1ffc8bb9c97f7b664e87347 jdk7u1-b03
+2256c20e66857f80cacda14ffdbc0979c929d7f8 jdk7u1-b04
+79ec2a8c8aaf015e888e8997abd4767d216b4037 jdk7u1-b05
+6c9ac74190a073bcee616a39f8fc5c6b2a501ce1 jdk7u2-b01
+4b0c44f2f7f13e4a44497d8d8cd8dcef5bb29d0b jdk7u2-b04
+06ec99824fc7473d1b73e3d0a37f7e046d9be5ca jdk7u2-b05
+5946b073c57a340cc566414cd50c954c044576e1 jdk7u2-b06
+323d917b683e94c1bdca51c31b257ec492a106a6 jdk7u2-b07
+db8ccf2cbb339005a5b90ec0ca825db43c130e20 jdk7u2-b08
+f2dcb5ade608d0d503f06f3748ef5be2ff1fe9a1 jdk7u2-b09
+38711a9aabde08547f9998233a21fd4b94879893 jdk7u1-b06
+5d8a5978b6ea914d715c8ab4e905a865225dd8a0 jdk7u1-b07
+407177580b012f89df837094b45287b7d250c911 jdk7u1-b08
+0c5c2b2462f104970eefa4a47b3c4428efd81cf0 jdk7u2-b11
+0e61ef309edd2deb71f53f2bdaf6dcff1c80bfb8 jdk7u2-b12
+d9ac427e5149d1db12c6f3e4aa4280587c06aed5 jdk7u2-b13
+0efaf5c97fba2ee7864240efaa0df651a2635ae5 jdk7u2-b21
diff -r 948e734135ea -r 7300d2ab9fb2 .jcheck/conf
--- a/.jcheck/conf	Wed Sep 28 23:12:50 2011 +0100
+++ b/.jcheck/conf	Thu Dec 22 15:20:11 2011 +0000
@@ -1,1 +1,2 @@
 project=jdk7
+bugids=dup
diff -r 948e734135ea -r 7300d2ab9fb2 THIRD_PARTY_README
--- a/THIRD_PARTY_README	Wed Sep 28 23:12:50 2011 +0100
+++ b/THIRD_PARTY_README	Thu Dec 22 15:20:11 2011 +0000
@@ -216,15 +216,16 @@
 is included with JRE 7, JDK 7, and OpenJDK 7.
 
 You are receiving a copy of the Elliptic Curve Cryptography library in source
-form with the JDK 7 source distribution and object code in the JRE 7 & JDK 7
-runtime.
-
-The terms of the Oracle license do NOT apply to the Elliptic Curve
-Cryptography library program; it is licensed under the following license,
-separately from the Oracle programs you receive. If you do not wish to install
-this program, you may delete the library named libsunec.so (on Solaris and
-Linux systems) or sunec.dll (on Windows systems) from the JRE bin directory
-reserved for native libraries.
+form with the JDK 7 and OpenJDK7 source distributions, and as object code in
+the JRE 7 & JDK 7 runtimes.
+
+In the case of the JRE 7 & JDK 7 runtimes, the terms of the Oracle license do
+NOT apply to the Elliptic Curve Cryptography library; it is licensed under the
+following license, separately from Oracle's JDK & JRE.  If you do not wish to
+install the Elliptic Curve Cryptography library, you may delete the library
+named libsunec.so (on Solaris and Linux systems) or sunec.dll (on Windows
+systems) from the JRE bin directory reserved for native libraries.
+
 
 --- begin of LICENSE ---
 
@@ -1000,7 +1001,7 @@
 
 -------------------------------------------------------------------------------
 
-%% This notice is provided with respect to libpng 1.2.18, which is 
+%% This notice is provided with respect to libpng 1.5.4, which is 
 included with JRE 7, JDK 7, and OpenJDK 7.
 
 --- begin of LICENSE ---
@@ -1014,8 +1015,10 @@
 If you modify libpng you may insert additional notices immediately following
 this sentence.
 
-libpng versions 1.2.6, August 15, 2004, through 1.2.18, May 15, 2007, are
-Copyright (c) 2004, 2006-2007 Glenn Randers-Pehrson, and are
+This code is released under the libpng license.
+
+libpng versions 1.2.6, August 15, 2004, through 1.5.4, July 7, 2011, are
+Copyright (c) 2004, 2006-2011 Glenn Randers-Pehrson, and are
 distributed according to the same disclaimer and license as libpng-1.2.5
 with the following individual added to the list of Contributing Authors
 
@@ -1112,7 +1115,7 @@
 
 Glenn Randers-Pehrson
 glennrp at users.sourceforge.net
-May 15, 2007
+July 7, 2011
 
 --- end of LICENSE ---
 
diff -r 948e734135ea -r 7300d2ab9fb2 jaxp.properties