# HG changeset patch
# User cl
# Date 1298504926 28800
# Node ID 0aa3b49089112d5faa77902ad680c582ab53f651
# Parent  0a2ecf4cc3849ac9dcc30c52b951f20724d9d5b4# Parent  cdef89d821bdfbade9a6954d70cd32ca01e1f52f
Merge

diff -r 0a2ecf4cc384 -r 0aa3b4908911 LICENSE
--- a/LICENSE	Fri Feb 18 14:23:37 2011 -0800
+++ b/LICENSE	Wed Feb 23 15:48: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