# HG changeset patch
# User trims
# Date 1274134388 25200
# Node ID 6a47e8c8eccf65211116a23d0450d9fa457ee97b
# Parent  e776591addb0f2f145b0f5ad301692cc5a878a02# Parent  e3b128efead16411912999bc0ad37c8ec0c66a13
Merge

diff -r e776591addb0 -r 6a47e8c8eccf make/hotspot_distro
--- a/make/hotspot_distro	Mon May 17 14:55:57 2010 -0700
+++ b/make/hotspot_distro	Mon May 17 15:13:08 2010 -0700
@@ -28,5 +28,5 @@
 
 # Don't put quotes (fail windows build).
 HOTSPOT_VM_DISTRO=Java HotSpot(TM)
-COMPANY_NAME=Sun Microsystems, Inc.
+COMPANY_NAME=Oracle Corporation
 PRODUCT_NAME=Java(TM) Platform SE