Merge commit 'origin/master' into martins
authorMartin Schwenke <martin@meltin.net>
Fri, 16 Jan 2009 03:19:55 +0000 (14:19 +1100)
committerMartin Schwenke <martin@meltin.net>
Fri, 16 Jan 2009 03:19:55 +0000 (14:19 +1100)
(This used to be ctdb commit 4928718a346f086f1683c78d52b0bf009c1150a3)


Trivial merge