merge from tridge
authorRonnie Sahlberg <sahlberg@ronnie>
Sun, 10 Jun 2007 07:31:52 +0000 (17:31 +1000)
committerRonnie Sahlberg <sahlberg@ronnie>
Sun, 10 Jun 2007 07:31:52 +0000 (17:31 +1000)
(This used to be ctdb commit c99367eba21a0140c0870f448d8dd787446ec3ae)


Trivial merge