--- a/hotspot/src/share/vm/runtime/arguments.cpp	Fri Aug 27 21:31:15 2010 -0700
+++ b/hotspot/src/share/vm/runtime/arguments.cpp	Tue Aug 31 03:14:00 2010 -0700
@@ -2855,6 +2855,13 @@
       CommandLineFlags::printFlags();
       vm_exit(0);
     }
+
+#ifndef PRODUCT
+    if (match_option(option, "-XX:+PrintFlagsWithComments", &tail)) {
+      CommandLineFlags::printFlags(true);
+      vm_exit(0);
+    }
+#endif
   }
 
   if (IgnoreUnrecognizedVMOptions) {