merge from tridge
authorRonnie Sahlberg <sahlberg@ronnie>
Fri, 11 May 2007 00:37:42 +0000 (10:37 +1000)
committerRonnie Sahlberg <sahlberg@ronnie>
Fri, 11 May 2007 00:37:42 +0000 (10:37 +1000)
(This used to be ctdb commit 826058b547b8e836f0a7066e9479e481ad9c472e)


Trivial merge