Merge root@10.1.1.27:/shared/ctdb/ctdb-git
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Tue, 30 Mar 2010 00:58:37 +0000 (11:58 +1100)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Tue, 30 Mar 2010 00:58:37 +0000 (11:58 +1100)
(This used to be ctdb commit 2fb331d29f4756a7f45489a03cbd065d934f85bc)


Trivial merge