merge from tridge
authorRonnie Sahlberg <sahlberg@ronnie>
Wed, 8 Aug 2007 00:14:44 +0000 (10:14 +1000)
committerRonnie Sahlberg <sahlberg@ronnie>
Wed, 8 Aug 2007 00:14:44 +0000 (10:14 +1000)
commitc522b852c49c1dd4e77616b665042cd954aa2a46
treeb0896723bd82278e36e73dc684eb059672ffbda0
parent65d78aade4d9a40982b370c6bab1b26b1ee3c3ac
parent8a81a03b9eb3c89474bd46cd872269543627706c
merge from tridge

(This used to be ctdb commit b6ffb429ab33a66e374e9481bbf4fe6b47a67dab)