Merge branch 'master' of ssh://git.samba.org/data/git/ctdb
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Mon, 5 Sep 2011 06:42:49 +0000 (16:42 +1000)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Mon, 5 Sep 2011 06:42:49 +0000 (16:42 +1000)
(This used to be ctdb commit 32320ee278d1eec9aef18b400c0ddaa445d4211e)


Trivial merge