merge from tridge
authorRonnie sahlberg <ronniesahlberg@gmail.com>
Mon, 16 Apr 2007 06:03:08 +0000 (16:03 +1000)
committerRonnie sahlberg <ronniesahlberg@gmail.com>
Mon, 16 Apr 2007 06:03:08 +0000 (16:03 +1000)
(This used to be ctdb commit 7e60f4ea41707b064e646d0271e81a18f5640aba)


Trivial merge