Merge branch 'master' of 10.1.1.27:/shared/ctdb/ctdb-master
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Mon, 24 Oct 2011 02:30:28 +0000 (13:30 +1100)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Mon, 24 Oct 2011 02:30:28 +0000 (13:30 +1100)

Trivial merge