Merge branch 'status-test-2'
authorMartin Schwenke <martin@meltin.net>
Fri, 4 Dec 2009 03:44:46 +0000 (14:44 +1100)
committerMartin Schwenke <martin@meltin.net>
Fri, 4 Dec 2009 03:44:46 +0000 (14:44 +1100)
(This used to be ctdb commit 5fc297a6bd49d9366703eef3edb9bdf0fe8505cc)


Trivial merge