merge from jim
authorAndrew Tridgell <tridge@samba.org>
Tue, 29 May 2007 04:46:29 +0000 (14:46 +1000)
committerAndrew Tridgell <tridge@samba.org>
Tue, 29 May 2007 04:46:29 +0000 (14:46 +1000)
commitdb5862279bf71f71d854a324df719590090d46f0
treec00eef1457d89d6e928ae410bf4f702a611c5661
parent1140d5a20a9a27d36631fd168d09a849b9a4983c
parent239f698b63e9633328ab700c6f244d1e842c2a07
merge from jim
(This used to be ctdb commit a41acd1835af91176a2de1c251a8709dc42b65ac)