Merge commit 'origin/master'
authorMartin Schwenke <martin@meltin.net>
Wed, 10 Feb 2010 09:24:28 +0000 (20:24 +1100)
committerMartin Schwenke <martin@meltin.net>
Wed, 10 Feb 2010 09:24:28 +0000 (20:24 +1100)
(This used to be ctdb commit 19523fbb12db1ec1e5ee38de1b2d3b99a74c6ca4)


Trivial merge