merge from ronnie
authorAndrew Tridgell <tridge@samba.org>
Mon, 24 Sep 2007 03:52:35 +0000 (13:52 +1000)
committerAndrew Tridgell <tridge@samba.org>
Mon, 24 Sep 2007 03:52:35 +0000 (13:52 +1000)
commite9a47bb5ecc110508e558788aa16c4232c3fad85
tree152bfc89cf9efd31d2646ba3975b5ca571600784
parente3d0ec8797554f7150766d1a396cc32d356775f3
parent359448ff00932d99c981b9a59ad338719804d3a3
merge from ronnie
(This used to be ctdb commit c67f516f01f8033e3fbd0f338eaa3a8afb862495)