Merge branch 'master' of 10.1.1.27:/shared/ctdb/ctdb-master
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Mon, 20 Feb 2012 10:30:13 +0000 (21:30 +1100)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Mon, 20 Feb 2012 10:30:13 +0000 (21:30 +1100)
(This used to be ctdb commit 0fd3bf919b1b8e5aaa98444c306c6770a6a3209f)


Trivial merge