merge from tridge
authorRonnie Sahlberg <sahlberg@ronnie>
Thu, 22 Nov 2007 22:51:41 +0000 (09:51 +1100)
committerRonnie Sahlberg <sahlberg@ronnie>
Thu, 22 Nov 2007 22:51:41 +0000 (09:51 +1100)
(This used to be ctdb commit f9e3531747d293711016bce99f08f42366c9d85b)


Trivial merge