merge from ronnie
authorAndrew Tridgell <tridge@samba.org>
Thu, 18 Oct 2007 05:51:15 +0000 (15:51 +1000)
committerAndrew Tridgell <tridge@samba.org>
Thu, 18 Oct 2007 05:51:15 +0000 (15:51 +1000)
commit5e3d5b1314336c78e9508901e42fc2f5cd858a4f
tree638d6f33db617feb4e5b1bc9a3730490402d72d9
parentd939a2901b8aa3128909cdd46b0cc1a0669d9a56
parente4ec6e9d6b7ff7bfcabdba6825bb650e80652f40
merge from ronnie
(This used to be ctdb commit a6b094fdede0ae850e87877fad0b9dd1f3a26869)