Merge root@10.1.1.27:/shared/ctdb/ctdb-git
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Tue, 30 Mar 2010 01:50:19 +0000 (12:50 +1100)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Tue, 30 Mar 2010 01:50:19 +0000 (12:50 +1100)
(This used to be ctdb commit 5ed7d6788b8f7bf71d7d66c3a620b1aec54dfd81)


Trivial merge