merge from tridge
authorRonnie sahlberg <ronniesahlberg@gmail.com>
Thu, 19 Apr 2007 00:07:07 +0000 (10:07 +1000)
committerRonnie sahlberg <ronniesahlberg@gmail.com>
Thu, 19 Apr 2007 00:07:07 +0000 (10:07 +1000)
(This used to be ctdb commit 414952b2dd48de4a9edb532ba9c2cb6e22bb6d7f)


Trivial merge