Merge commit 'origin/master' into martins
authorMartin Schwenke <martin@meltin.net>
Thu, 8 Jan 2009 06:28:09 +0000 (17:28 +1100)
committerMartin Schwenke <martin@meltin.net>
Thu, 8 Jan 2009 06:28:09 +0000 (17:28 +1100)
(This used to be ctdb commit 928c30213fb9f0c32d82995892ccdd8e054c9d6e)


Trivial merge