# HG changeset patch
# User thurka
# Date 1218772522 -7200
# Node ID 7f9b895777f8f7f7085d4df9ee438ba5cc58f392
# Parent  4852f4a82e58d19de2328ae9fed07e40bb33fab4# Parent  f3a650d8df24b534278f1f74fa7e0990586cebf7
Merge

diff -r 4852f4a82e58 -r 7f9b895777f8 src/share/vm/runtime/statSampler.cpp
--- a/src/share/vm/runtime/statSampler.cpp	Thu Aug 14 11:18:53 2008 -0700
+++ b/src/share/vm/runtime/statSampler.cpp	Fri Aug 15 05:55:22 2008 +0200
@@ -217,6 +217,7 @@
   "java.class.path",
   "java.endorsed.dirs",
   "java.ext.dirs",
+  "java.version",
   "java.home",
   NULL
 };