Merge commit 'origin/master'
authorMartin Schwenke <martin@meltin.net>
Wed, 31 Mar 2010 06:52:42 +0000 (17:52 +1100)
committerMartin Schwenke <martin@meltin.net>
Wed, 31 Mar 2010 06:52:42 +0000 (17:52 +1100)
(This used to be ctdb commit 4fb662bba6d96d4c04dadd9f908c4184ef4e969a)


Trivial merge