Merge root@10.1.1.27:/shared/ctdb/ctdb-git
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Mon, 6 Jul 2009 01:28:10 +0000 (11:28 +1000)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Mon, 6 Jul 2009 01:28:10 +0000 (11:28 +1000)

Trivial merge