Merge branch 'master' into martins
authorMartin Schwenke <martin@meltin.net>
Wed, 19 Nov 2008 02:21:07 +0000 (13:21 +1100)
committerMartin Schwenke <martin@meltin.net>
Wed, 19 Nov 2008 02:21:07 +0000 (13:21 +1100)
(This used to be ctdb commit f77a91c0828a79f99d0c422f7e09b17c69174907)


Trivial merge