# HG changeset patch
# User cl
# Date 1298504939 28800
# Node ID eab6f27131e4e2f0af0016b35b18ae65cdd249d9
# Parent  f2ad604323c0dc5f4811c80bfa4c1300ecfc5a18# Parent  a57220f2275192a38a520e9089d1a2573f0c5b07
Merge

diff -r f2ad604323c0 -r eab6f27131e4 LICENSE
--- a/LICENSE	Fri Feb 18 14:23:42 2011 -0800
+++ b/LICENSE	Wed Feb 23 15:48:59 2011 -0800
@@ -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