Merge branch 'master' of ssh://git.samba.org/data/git/ctdb
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Thu, 12 May 2011 08:58:07 +0000 (18:58 +1000)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Thu, 12 May 2011 08:58:07 +0000 (18:58 +1000)
(This used to be ctdb commit 307e915459c26a728a1ec16bd735d983d493df53)


Trivial merge