merge from tridge
authorRonnie Sahlberg <sahlberg@ronnie>
Thu, 24 May 2007 06:06:23 +0000 (16:06 +1000)
committerRonnie Sahlberg <sahlberg@ronnie>
Thu, 24 May 2007 06:06:23 +0000 (16:06 +1000)
(This used to be ctdb commit 4041d78de3bf568ea12d6e5ae48791a5a5656aaa)


Trivial merge