Reinstate -h option, which disappeared at some point.


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@2420 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/coregrind/vg_main.c b/coregrind/vg_main.c
index a9181a6..fb4a1b7 100644
--- a/coregrind/vg_main.c
+++ b/coregrind/vg_main.c
@@ -1509,7 +1509,7 @@
 "\n"
 "  common user options for all Valgrind tools, with defaults in [ ]:\n"
 "    --tool=<name>             Use the Valgrind tool named <name>\n"
-"    --help                    show this message\n"
+"    -h --help                 show this message\n"
 "    --help-debug              show this message, plus debugging options\n"
 "    --version                 show version\n"
 "    -q --quiet                run silently; only print error msgs\n"
@@ -1616,7 +1616,8 @@
          printf("valgrind-" VERSION "\n");
          exit(0);
 
-      } else if (VG_CLO_STREQ(VG_(vg_argv)[i], "--help")) {
+      } else if (VG_CLO_STREQ(VG_(vg_argv)[i], "--help") ||
+                 VG_CLO_STREQ(VG_(vg_argv)[i], "-h")) {
          *need_help = 1;
 
       } else if (VG_CLO_STREQ(VG_(vg_argv)[i], "--help-debug")) {