merge from ronnie
authorAndrew Tridgell <tridge@samba.org>
Fri, 3 Aug 2007 03:18:44 +0000 (13:18 +1000)
committerAndrew Tridgell <tridge@samba.org>
Fri, 3 Aug 2007 03:18:44 +0000 (13:18 +1000)
commit5e0215a0be12db320dc142d5283fbb90fa7da65a
tree7c5d50dc5171b62408aad1f4aec1c57843ac8049
parent5b899f0edf86afa2b8329b0204cc84051ca1de15
parent9262e2ab8aaea18993b96a90c45e7fe5305527e6
merge from ronnie
(This used to be ctdb commit e2f11745df88d22e98fc5d5e1ca69acac13f1423)