merge from tridge
authorRonnie Sahlberg <sahlberg@ronnie>
Sat, 9 Jun 2007 22:53:44 +0000 (08:53 +1000)
committerRonnie Sahlberg <sahlberg@ronnie>
Sat, 9 Jun 2007 22:53:44 +0000 (08:53 +1000)
(This used to be ctdb commit 171f50bd5c87a71316a3efd346f7fd7496de9914)


Trivial merge