merge from tridge
authorRonnie sahlberg <ronniesahlberg@gmail.com>
Thu, 19 Apr 2007 01:58:34 +0000 (11:58 +1000)
committerRonnie sahlberg <ronniesahlberg@gmail.com>
Thu, 19 Apr 2007 01:58:34 +0000 (11:58 +1000)
commit2013ae16bac93af2566978e544bd32174be5c0d2
treea653f403e5a6a4049eabb7a99eb8d07653bc4802
parent697126e61f566319036a0b3b2be5eb9e9af46f53
parentd0af75d1fa0347a543b37783a7a53e83465399a5
merge from tridge

(This used to be ctdb commit e9561cfe190af8c0594de7531fbf087730aae60c)