merge from tridge
authorRonnie Sahlberg <sahlberg@ronnie>
Thu, 6 Sep 2007 23:21:40 +0000 (09:21 +1000)
committerRonnie Sahlberg <sahlberg@ronnie>
Thu, 6 Sep 2007 23:21:40 +0000 (09:21 +1000)
(This used to be ctdb commit 58c918b1bfe09c31049769dee266129cbad4cb20)


Trivial merge