Merge branch 'master' of ssh://git.samba.org/data/git/ctdb
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Sun, 19 Feb 2012 22:54:52 +0000 (09:54 +1100)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Sun, 19 Feb 2012 22:54:52 +0000 (09:54 +1100)
(This used to be ctdb commit d3c54ae9cc83f74d15f40bbfff95404b270d2f80)


Trivial merge