merge from tridge
authorRonnie sahlberg <ronniesahlberg@gmail.com>
Sun, 8 Apr 2007 02:11:48 +0000 (12:11 +1000)
committerRonnie sahlberg <ronniesahlberg@gmail.com>
Sun, 8 Apr 2007 02:11:48 +0000 (12:11 +1000)
(This used to be ctdb commit d7764dec0e9d17290ae310898c147bebe48a0f5c)


Trivial merge