merge from tridge
authorRonnie Sahlberg <sahlberg@ronnie>
Fri, 21 Sep 2007 03:20:29 +0000 (13:20 +1000)
committerRonnie Sahlberg <sahlberg@ronnie>
Fri, 21 Sep 2007 03:20:29 +0000 (13:20 +1000)
commite9f45419da53de4eb0ba9386c7a4b4a896f00b9b
tree570868454832d19a18a4b7ca6e5757e272bd686d
parent577fffdc5d9a09be848fab3ff3207b39fd71a2e2
parentc60988325d6b154e34f8566731422efab53ddc34
merge from tridge

(This used to be ctdb commit bb283ee8ebaea848366e9c3b3d3244da459a7967)