merge from tridge
authorRonnie sahlberg <ronniesahlberg@gmail.com>
Tue, 17 Apr 2007 05:02:20 +0000 (15:02 +1000)
committerRonnie sahlberg <ronniesahlberg@gmail.com>
Tue, 17 Apr 2007 05:02:20 +0000 (15:02 +1000)
commit67a9f54dabeeb0ec5d8de54e3c7c290cfe392901
tree49657961b95ccc0170fef405ab08bcf450820dd6
parentbccf3c7e8e8ecf8310367622239e246bf9dd720c
parent3a3bac80b9084ead1b650714c01a8230ef3635f3
merge from tridge

(This used to be ctdb commit e1ea91fa541a21c8164b8bd26b9c77053e8487cb)