Merge root@10.1.1.27:/shared/ctdb/ctdb-git
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Thu, 8 Apr 2010 04:30:01 +0000 (14:30 +1000)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Thu, 8 Apr 2010 04:30:01 +0000 (14:30 +1000)

Trivial merge