merge from tridge
authorRonnie Sahlberg <sahlberg@ronnie>
Thu, 3 May 2007 04:42:53 +0000 (14:42 +1000)
committerRonnie Sahlberg <sahlberg@ronnie>
Thu, 3 May 2007 04:42:53 +0000 (14:42 +1000)
(This used to be ctdb commit abf4c9d0cccd937a7036bd03b1b4c6e635c8eb58)


Trivial merge