Merge branch 'master' of 10.1.1.27:/shared/ctdb/ctdb-master
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Tue, 8 Nov 2011 03:01:22 +0000 (14:01 +1100)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Tue, 8 Nov 2011 03:01:22 +0000 (14:01 +1100)

Trivial merge