merge from ronnie
authorAndrew Tridgell <tridge@samba.org>
Tue, 17 Apr 2007 01:54:19 +0000 (11:54 +1000)
committerAndrew Tridgell <tridge@samba.org>
Tue, 17 Apr 2007 01:54:19 +0000 (11:54 +1000)
commit0304eaa77955919b18b0220ea729ccac6ba3d5f7
tree168d965ad913ec6edde5e5e80c4495f629dbe57b
parent80ec427ec740bfb14a45eb1fd6e783e363781096
parent45660a3c48d182e8871b8ae5d1d35603967f3fd6
merge from ronnie
(This used to be ctdb commit d854392b04c46bcdd008cced5d16a03d81f97bd0)