# HG changeset patch
# User trims
# Date 1298666806 28800
# Node ID 5a422316032633bf8280a6658230ce33e1eb8b66
# Parent  f3e07ceeaed916c8de38f413d36dc95917b5905d# Parent  76b97f73ee919732646a726c2bb4db20f650f952
Merge

diff -r 76b97f73ee91 -r 5a4223160326 .hgtags
--- a/.hgtags	Fri Feb 25 08:17:30 2011 -0800
+++ b/.hgtags	Fri Feb 25 12:46:46 2011 -0800
@@ -148,3 +148,6 @@
 9a5762f448595794d449a8e17342abd81a3fadaf jdk7-b128
 ae4b185f2ed14af7bab610738c333840598cdcc4 jdk7-b129
 ae4b185f2ed14af7bab610738c333840598cdcc4 hs21-b01
+e9aa2ca89ad6c53420623d579765f9706ec523d7 jdk7-b130
+0aa3b49089112d5faa77902ad680c582ab53f651 jdk7-b131
+e9aa2ca89ad6c53420623d579765f9706ec523d7 hs21-b02
diff -r 76b97f73ee91 -r 5a4223160326 LICENSE
--- a/LICENSE	Fri Feb 25 08:17:30 2011 -0800
+++ b/LICENSE	Fri Feb 25 12:46:46 2011 -0800
@@ -325,11 +325,11 @@
 
 "CLASSPATH" EXCEPTION TO THE GPL
 
-Certain source files distributed by Oracle 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."
+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