Merge branch 'master' of 10.1.1.27:/shared/ctdb/ctdb-master
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Tue, 6 Sep 2011 07:29:30 +0000 (17:29 +1000)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Tue, 6 Sep 2011 07:29:30 +0000 (17:29 +1000)

Trivial merge