Merge branch 'test_suite' into ronnie_target
authorMartin Schwenke <martin@meltin.net>
Tue, 9 Aug 2011 03:12:08 +0000 (13:12 +1000)
committerMartin Schwenke <martin@meltin.net>
Tue, 9 Aug 2011 03:12:08 +0000 (13:12 +1000)
(This used to be ctdb commit 414c4d8e901353a3529f82746ffe2e4983a155d6)


Trivial merge