merge from tridge
authorRonnie sahlberg <ronniesahlberg@gmail.com>
Wed, 18 Apr 2007 04:45:08 +0000 (14:45 +1000)
committerRonnie sahlberg <ronniesahlberg@gmail.com>
Wed, 18 Apr 2007 04:45:08 +0000 (14:45 +1000)
(This used to be ctdb commit 4a6cb8a5c411457459eaadddd03ef64924505cd8)


Trivial merge