Merge branch 'master' of 10.1.1.27:/shared/ctdb/ctdb-master
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Fri, 28 Oct 2011 01:56:24 +0000 (12:56 +1100)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Fri, 28 Oct 2011 01:56:24 +0000 (12:56 +1100)

Trivial merge