MERGED: perftest-fixes, docs-html

[Stefan Westerfeld <stefan space twc de>]

   Hi!

I've today merged these branches:

  perftest-fixes  Improves the accuracy of the C++ binding performance test
  docs-html       Fix makefile rules in docs directory

there was a bit of confusion because I've send two timeout merges (only one
made it to the list, due to technical problems), the earlier timeout merge
expired today, so I merged.

   Cu... Stefan
-- 
Stefan Westerfeld, Hamburg/Germany, http://space.twc.de/~stefan