# HG changeset patch
# User dholmes
# Date 1304565058 14400
# Node ID f49c31acee881a04e978f926fb958c34f539443a
# Parent  6c978a541c03860e22f8a69d5c774851bde3b40b# Parent  6dce0126f44ec13fb804233853816118c0db02c9
Merge

diff -r 6dce0126f44e -r f49c31acee88 src/share/vm/runtime/arguments.cpp
--- a/src/share/vm/runtime/arguments.cpp	Wed May 04 11:04:45 2011 -0400
+++ b/src/share/vm/runtime/arguments.cpp	Wed May 04 23:10:58 2011 -0400
@@ -960,7 +960,7 @@
   // Ensure Agent_OnLoad has the correct initial values.
   // This may not be the final mode; mode may change later in onload phase.
   PropertyList_unique_add(&_system_properties, "java.vm.info",
-                          (char*)Abstract_VM_Version::vm_info_string(), false);
+                          (char*)VM_Version::vm_info_string(), false);
 
   UseInterpreter             = true;
   UseCompiler                = true;