merge from tridge
authorRonnie Sahlberg <sahlberg@ronnie>
Thu, 6 Sep 2007 23:21:40 +0000 (09:21 +1000)
committerRonnie Sahlberg <sahlberg@ronnie>
Thu, 6 Sep 2007 23:21:40 +0000 (09:21 +1000)
commit68c37f9b4156e0c2ff1c4ad68e79677ddf58d57b
tree914e34ef215a5eaf4ebc1a0216551ddf3314c9f5
parentfa872de66418db4978f0645f5420385a608480a6
parentc572d3c226353d5b57bbf0ed00536f72864e8407
merge from tridge

(This used to be ctdb commit 58c918b1bfe09c31049769dee266129cbad4cb20)