merge from tridge
authorRonnie Sahlberg <sahlberg@ronnie>
Fri, 18 May 2007 07:10:21 +0000 (17:10 +1000)
committerRonnie Sahlberg <sahlberg@ronnie>
Fri, 18 May 2007 07:10:21 +0000 (17:10 +1000)
(This used to be ctdb commit d045dff2c68d6d7fcf8e7c5037908fab3d55a16f)


Trivial merge