merge from ronnie

diff --cc tests/bench.sh
index 48a4277591ded6f848abd51d3c18a53d1be80c68,48a4277591ded6f848abd51d3c18a53d1be80c68..f83401f260a6c64239e9bfdd1c8997a619ee970f
--- 1/tests/bench.sh
--- 2/tests/bench.sh
+++ b/tests/bench.sh
@@@ -17,7 -17,7 +17,7 @@@ tests/start_daemons.sh $NUMNODES nodes.
  killall -9 ctdb_bench
  echo "Trying $NUMNODES nodes"
  for i in `seq 1 $NUMNODES`; do
--  valgrind -q $VALGRIND bin/ctdb_bench --socket sock.$i -n $NUMNODES $*  &
++  $VALGRIND bin/ctdb_bench --socket sock.$i -n $NUMNODES $*  &
  done
  
  wait