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)
commit7b6072b63d62bf47bebc2c7298a1fa8e0b1d7c3c
tree2ace877a30ba90d75ccdce272169021049d7ddd4
parente28c652ccabad2a3df6f60d95bcd4f32a3feaba8
parentb17bf38c648c5ac08c45fe7119a6fe4a5bfdd6dd
Merge branch 'status-test-2'

(This used to be ctdb commit 5fc297a6bd49d9366703eef3edb9bdf0fe8505cc)