# HG changeset patch
# User ohair
# Date 1297891831 28800
# Node ID cd24018b77431942d59b33df3bfb74bbbc16f38a
# Parent  360205957eb0a734d5d6a69963cf1c704029c82f
7013964: openjdk LICENSE file needs rebranding
Reviewed-by: darcy, katleman, jjg

diff -r 360205957eb0 -r cd24018b7743 hotspot/LICENSE
--- a/hotspot/LICENSE	Fri Feb 11 14:30:27 2011 -0800
+++ b/hotspot/LICENSE	Wed Feb 16 13:30:31 2011 -0800
@@ -325,11 +325,11 @@
 
 "CLASSPATH" EXCEPTION TO THE GPL
 
-Certain source files distributed by Oracle 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."
+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