# HG changeset patch
# User cl
# Date 1298504940 28800
# Node ID 438abc0356cd97d91b25f67cd1abc9883e22f6ed
# Parent  a8ffd75ad5df7990e5376cf9fc9453cb27523457# Parent  9e3904866cab43d9995029321bd64cefa982d9df
Merge

diff -r a8ffd75ad5df -r 438abc0356cd LICENSE
--- a/LICENSE	Fri Feb 18 14:23:43 2011 -0800
+++ b/LICENSE	Wed Feb 23 15:49:00 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