merge from tridge
authorRonnie Sahlberg <sahlberg@ronnie>
Wed, 16 Jan 2008 22:39:16 +0000 (09:39 +1100)
committerRonnie Sahlberg <sahlberg@ronnie>
Wed, 16 Jan 2008 22:39:16 +0000 (09:39 +1100)
(This used to be ctdb commit 54136ff841459184d44acc314bff3d36c2868391)


Trivial merge