Merge branch 'master' of git+ssh://git.samba.org/data/git/sahlberg/dbench
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Sat, 20 Nov 2010 22:47:30 +0000 (09:47 +1100)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Sat, 20 Nov 2010 22:47:30 +0000 (09:47 +1100)

Trivial merge