# HG changeset patch
# User cl
# Date 1298504939 28800
# Node ID df8969303f9645175a172e064a42da29152bdf13
# Parent  03ae3d309c780a2e005beb4d4f2d736086bbf8c8# Parent  dc061d84b4ceb0f76a282a025ad7c54a7cae7bed
Merge

diff -r 03ae3d309c78 -r df8969303f96 jaxp/LICENSE
--- a/jaxp/LICENSE	Fri Feb 18 14:23:42 2011 -0800
+++ b/jaxp/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