Merge commit 'origin/master'
authorMartin Schwenke <martin@meltin.net>
Mon, 19 Oct 2009 05:46:45 +0000 (16:46 +1100)
committerMartin Schwenke <martin@meltin.net>
Mon, 19 Oct 2009 05:46:45 +0000 (16:46 +1100)
(This used to be ctdb commit b3ae2b753261443dca317803752a9d61285a3270)


Trivial merge