# HG changeset patch
# User Thomas Wuerthinger <thomas@wuerthinger.net>
# Date 1301940055 -7200
# Node ID 0579225e067012f9c4a3e576b05a5079637c0acd
# Parent  017f3eeb2901aa5f745f1d95a1f0c4e6e42984c5# Parent  a2babfb34c244b9ad030b27e1ee5b499d6bd4eba
Merge.

diff -r a2babfb34c24 -r 0579225e0670 src/share/vm/runtime/vm_version.cpp
--- a/src/share/vm/runtime/vm_version.cpp	Mon Apr 04 18:47:04 2011 +0200
+++ b/src/share/vm/runtime/vm_version.cpp	Mon Apr 04 20:00:55 2011 +0200
@@ -118,7 +118,7 @@
   #define VMTYPE "Zero"
 #endif // SHARK
 #else // ZERO
-   #define VMTYPE COMPILER1_PRESENT("Client")   \
+   #define VMTYPE COMPILER1_PRESENT("Graal")   \
                   COMPILER2_PRESENT("Server")
 #endif // ZERO
 #endif // TIERED