Merge commit 'origin/status-test' into status-test
authorMartin Schwenke <martin@meltin.net>
Tue, 24 Nov 2009 05:14:54 +0000 (16:14 +1100)
committerMartin Schwenke <martin@meltin.net>
Tue, 24 Nov 2009 05:14:54 +0000 (16:14 +1100)
commit1c7445d547f996492cec1174884a8edc4872804e
tree234890dfab31eddb926a1e8362b3dcd4a9a8ad3a
parentd595f41f385ebac0ce047338dec2c11aed12cf1b
parentff59bb34af7fdc0049ddc37e21856c628f4ab47e
Merge commit 'origin/status-test' into status-test

(This used to be ctdb commit 2e60749de3714239224cc04170a9aeeee158153f)