# HG changeset patch
# User andrew
# Date 1303270668 -3600
# Node ID 339c2d381d80dbf9b74604e6ba43ead276b8024e
# Parent  4c04de31900be430e88f10d7291f6e4ddb569871# Parent  ccea3282991ce8b678e188cf32a8239f76ff3bfa
Merge

diff -r 4c04de31900b -r 339c2d381d80 .hgtags
--- a/.hgtags	Sat Apr 09 00:45:00 2011 +0100
+++ b/.hgtags	Wed Apr 20 04:37:48 2011 +0100
@@ -106,3 +106,10 @@
 ef19f173578c804772d586a959fa3ab8a12c0598 jdk7-b127
 88d74afc55938033e744b537a22714bb2c82c9c0 jdk7-b128
 0f7b39ad902424e949e3d2dca8411b884888a76f jdk7-b129
+ba1fac1c2083196422a12130db174334179a4d44 jdk7-b130
+438abc0356cd97d91b25f67cd1abc9883e22f6ed jdk7-b131
+0e57c3272d377eee04cc32c898e9a558051516b0 jdk7-b132
+359d0c8c00a02d3a094c19f8a485b2217c99a4e0 jdk7-b133
+545de8303fec939db3892f7c324dd7df197e8f09 jdk7-b134
+d5fc61f18043765705ef22b57a68c924ab2f1a5b jdk7-b135
+c81d289c9a532d6e94af3c09d856a2a20529040f jdk7-b136
diff -r 4c04de31900b -r 339c2d381d80 LICENSE
--- a/LICENSE	Sat Apr 09 00:45:00 2011 +0100
+++ b/LICENSE	Wed Apr 20 04:37:48 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 4c04de31900b -r 339c2d381d80 make/Makefile
--- a/make/Makefile	Sat Apr 09 00:45:00 2011 +0100
+++ b/make/Makefile	Wed Apr 20 04:37:48 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