Merge branch 'master' of 10.1.1.27:/shared/ctdb/ctdb-master
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Fri, 28 Oct 2011 01:10:38 +0000 (12:10 +1100)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Fri, 28 Oct 2011 01:10:38 +0000 (12:10 +1100)
(This used to be ctdb commit 0452f212f2ddc1089dce83339bad0d73763f238f)


Trivial merge