Merge branch 'master' of 10.1.1.27:/shared/ctdb/ctdb-master
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Thu, 28 Jul 2011 22:53:43 +0000 (08:53 +1000)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Thu, 28 Jul 2011 22:53:43 +0000 (08:53 +1000)
(This used to be ctdb commit 0e60a738f9a6275ed45abc3d933f872d93132d92)


Trivial merge