merge from tridge
authorRonnie Sahlberg <sahlberg@ronnie>
Wed, 6 Jun 2007 03:01:24 +0000 (13:01 +1000)
committerRonnie Sahlberg <sahlberg@ronnie>
Wed, 6 Jun 2007 03:01:24 +0000 (13:01 +1000)
commitb51487b8f05bc64a2666bf406d05e0e190f1c6b1
tree08833285ee24a4f21924bcbd1447baae65bdb5d9
parentc6efeaad9123c3fec8939f206b894a3ca6a2595d
parent0edb079ea40be862a2146ae6823c14544fc2982e
merge from tridge

(This used to be ctdb commit 269bcf734b199ae15abd3bc09657030d178cff91)