merge from tridge
authorRonnie sahlberg <ronniesahlberg@gmail.com>
Wed, 18 Apr 2007 01:33:19 +0000 (11:33 +1000)
committerRonnie sahlberg <ronniesahlberg@gmail.com>
Wed, 18 Apr 2007 01:33:19 +0000 (11:33 +1000)
(This used to be ctdb commit e83db4d76ea498413ba4314e937d0ff298bd4cb6)


Trivial merge