changeset 2223:0aa3b4908911 jdk7-b131

Merge
author cl
date Wed, 23 Feb 2011 15:48:46 -0800
parents 0a2ecf4cc384 cdef89d821bd
children 2015d9b41531
files
diffstat 1 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/LICENSE	Fri Feb 18 14:23:37 2011 -0800
+++ b/LICENSE	Wed Feb 23 15:48:46 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