Merge root@10.1.1.27:/shared/ctdb/ctdb-git
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Mon, 29 Mar 2010 06:06:50 +0000 (17:06 +1100)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Mon, 29 Mar 2010 06:06:50 +0000 (17:06 +1100)

Trivial merge