# HG changeset patch
# User andrew
# Date 1303270667 -3600
# Node ID 1c2f25bf36b1d43920e94fb82a0afdafd29b1735
# Parent  b6f201c0649a2884bff67dd0a9746f4de157558c# Parent  1d87f7460cde7f8f30af668490f82b52b879bfd8
Merge

diff -r b6f201c0649a -r 1c2f25bf36b1 .hgtags
--- a/.hgtags	Sat Apr 09 00:44:57 2011 +0100
+++ b/.hgtags	Wed Apr 20 04:37:47 2011 +0100
@@ -106,3 +106,10 @@
 c532d6dbc8d18d55b5d693599ee5cd8250e16eb4 jdk7-b127
 a42c6132c746c86e9fc27ec80cbd699f6ee5edca jdk7-b128
 f5b60c5a310f992c6ca627d17ca3e042f0e0b2c3 jdk7-b129
+ab107c1bc4b918404b191838c455e9b2892389f3 jdk7-b130
+eab6f27131e4e2f0af0016b35b18ae65cdd249d9 jdk7-b131
+abe04c59a556a3821c30bd8839e3c74f5d4281d1 jdk7-b132
+8e1148c7911b02e00a727461525f239da025cab7 jdk7-b133
+d56b326ae0544fc16c3e0d0285876f3c82054db2 jdk7-b134
+4aa9916693dc1078580c1865e6f2584046851e5a jdk7-b135
+1759daa85d33800bd578853f9531f9de73f70fc7 jdk7-b136
diff -r b6f201c0649a -r 1c2f25bf36b1 LICENSE
--- a/LICENSE	Sat Apr 09 00:44:57 2011 +0100
+++ b/LICENSE	Wed Apr 20 04:37:47 2011 +0100
@@ -325,11 +325,11 @@
 
 "CLASSPATH" EXCEPTION TO THE GPL
 
-Certain source files distributed by Sun Microsystems, Inc.  are subject to
-the following clarification and special exception to the GPL, but only where
-Sun has expressly included in the particular source file's header the words
-"Sun designates this particular file as subject to the "Classpath" exception
-as provided by Sun in the LICENSE file that accompanied this code."
+Certain source files distributed by Oracle America and/or its affiliates are
+subject to the following clarification and special exception to the GPL, but
+only where Oracle has expressly included in the particular source file's header
+the words "Oracle designates this particular file as subject to the "Classpath"
+exception as provided by Oracle in the LICENSE file that accompanied this code."
 
     Linking this library statically or dynamically with other modules is making
     a combined work based on this library.  Thus, the terms and conditions of
diff -r b6f201c0649a -r 1c2f25bf36b1 jaxp.properties
--- a/jaxp.properties	Sat Apr 09 00:44:57 2011 +0100
+++ b/jaxp.properties	Wed Apr 20 04:37:47 2011 +0100
@@ -25,13 +25,13 @@
 
 drops.master.copy.base=${drops.dir}
 
-jaxp_src.bundle.name=jaxp-1_4_5-dev.zip
-jaxp_src.bundle.md5.checksum=84e2c26853262c9144133c6ff7ef5dc9
+jaxp_src.bundle.name=jaxp-1_4_5-dev1.zip
+jaxp_src.bundle.md5.checksum=53c95613c29852a12b93e7249f1aa227
 jaxp_src.master.bundle.dir=${drops.master.copy.base}
 jaxp_src.master.bundle.url.base=http://download.java.net/jaxp/1.4.5/dev
 
-jaxp_tests.bundle.name=jaxp-1_4_5-dev-unittests.zip
-jaxp_tests.bundle.md5.checksum=0377e715fa21814cb8006768c5967dc5
+jaxp_tests.bundle.name=jaxp-1_4_5-dev1-unittests.zip
+jaxp_tests.bundle.md5.checksum=754aaba2f4944f69bfea91dec11daf4c
 jaxp_tests.master.bundle.dir=${drops.master.copy.base}
 jaxp_tests.master.bundle.url.base=http://download.java.net/jaxp/1.4.5/dev
 
diff -r b6f201c0649a -r 1c2f25bf36b1 make/Makefile
--- a/make/Makefile	Sat Apr 09 00:44:57 2011 +0100
+++ b/make/Makefile	Wed Apr 20 04:37:47 2011 +0100
@@ -136,7 +136,7 @@
 else
   ANT = ant
   ifneq ($(shell which $(ANT) > /dev/null; echo $$?), 0)
-    $(error "\"ant\" not found; please set ANT_HOME or put \"ant\" on your PATH")
+    $(error "'ant' not found; please set ANT_HOME or put 'ant' on your PATH")
   endif
 endif