Fix Nulgrind's filter_stderr, and also fix the none/tests/cmdline2 test
(required fixing the usage msg slightly).
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@3278 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/coregrind/vg_main.c b/coregrind/vg_main.c
index 3048e8d..3776954 100644
--- a/coregrind/vg_main.c
+++ b/coregrind/vg_main.c
@@ -1512,14 +1512,14 @@
" --trace-symtab=no|yes show symbol table details? [no]\n"
" --trace-sched=no|yes show thread scheduler details? [no]\n"
" --wait-for-gdb=yes|no pause on startup to wait for gdb attach\n"
-"\n"
-" --vex-iropt-verbosity 0 .. 9 [0]\n"
-" --vex-iropt-level 0 .. 2 [2]\n"
-" --vex-iropt-precise-memory-exns [no]\n"
#if 0
" --model-pthreads=yes|no model the pthreads library [no]\n"
#endif
" --command-line-only=no|yes only use command line options [no]\n"
+"\n"
+" --vex-iropt-verbosity 0 .. 9 [0]\n"
+" --vex-iropt-level 0 .. 2 [2]\n"
+" --vex-iropt-precise-memory-exns [no]\n"
" --vex-iropt-unroll-thresh 0 .. 400 [120]\n"
" --vex-guest-max-insns 1 .. 100 [50]\n"
" --vex-guest-chase-thresh 0 .. 99 [10]\n"