Merge branch 'master' of git://git.samba.org/tridge/ctdb
authorRonnie Sahlberg <sahlberg@ronnie.(none)>
Mon, 4 Feb 2008 09:28:19 +0000 (20:28 +1100)
committerRonnie Sahlberg <sahlberg@ronnie.(none)>
Mon, 4 Feb 2008 09:28:19 +0000 (20:28 +1100)
(This used to be ctdb commit 08164957f948f0c9f604c260ccf658df9b3440b7)


Trivial merge