diff -r f91db74a6810 -r da091bb67459 src/share/vm/runtime/globals.hpp
--- a/src/share/vm/runtime/globals.hpp	Sat Feb 26 13:33:23 2011 -0500
+++ b/src/share/vm/runtime/globals.hpp	Mon Feb 28 14:19:52 2011 +0100
@@ -3730,6 +3730,9 @@
           "The file to create and for whose removal to await when pausing " \
           "at startup. (default: ./vm.paused.<pid>)")                       \
                                                                             \
+  diagnostic(bool, PauseAtExit, false,                                      \
+          "Pause and wait for keypress on exit if a debugger is attached")  \
+                                                                            \
   product(bool, ExtendedDTraceProbes,    false,                             \
           "Enable performance-impacting dtrace probes")                     \
                                                                             \