Merge branch 'master' of ssh://git.samba.org/data/git/ctdb
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Mon, 17 Oct 2011 04:08:39 +0000 (15:08 +1100)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Mon, 17 Oct 2011 04:08:39 +0000 (15:08 +1100)

Trivial merge