# HG changeset patch
# User cl
# Date 1298504903 28800
# Node ID 5d86d951426aaf340b1ba84ae2d5ab5da65a71e2
# Parent  5466f13d19bed4595aeba20b2652e10135491c54# Parent  da55264ff2fb5f4bb170d03da664625d355734a7
Merge

diff -r 5466f13d19be -r 5d86d951426a LICENSE
--- a/LICENSE	Mon Feb 21 14:18:37 2011 -0500
+++ b/LICENSE	Wed Feb 23 15:48:23 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