# HG changeset patch
# User cl
# Date 1298504905 28800
# Node ID 9d6dd2cdfcb92612dbd836ecded87770d52b49db
# Parent  49a96611c8707ee59ca1e19b09aa94695981da4c# Parent  a9335b646c1c6858c47260a9a95d40fa970dbad2
Merge

diff -r 49a96611c870 -r 9d6dd2cdfcb9 LICENSE
--- a/LICENSE	Fri Feb 18 14:23:33 2011 -0800
+++ b/LICENSE	Wed Feb 23 15:48:25 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