Merge branch 'master' of https://secure.softndesign.org/git/benchmarks

diff --cc generatedoc.sh
Simple merge

diff --cc test.sh
index a0c800b229f800a825357a4a2b26d62630178e9e,a32cc856d1b7740e0edf54ffe5cb38ad9db5c1e0..6317d2789cd509e6108f40649043879e6b0aaab6
--- 1/test.sh
--- 2/test.sh
+++ b/test.sh
@@@ -15,8 -16,9 +16,9 @@@ run() 
      echo "CPU load: $load% ($lcpu/$nbcpu)" | tee -a $name.log
      { ./$exe -d 1 -k $dcore -n 10000 -s -o $name.dat | tee -a $name.log; \
        kill -2 $(ps -e | awk '/[l]oad/ || /[s]leep/ { print $1 }') 2>/dev/null; } &
 -    ./load -n $lcpu >/dev/null
 +    ./load -r -1 -n $lcpu >/dev/null
      echo "Cleaning..."
+     date | tee -a $name.log
      sleep 1
    done
  }