merge from ronnie
authorAndrew Tridgell <tridge@samba.org>
Mon, 2 Jul 2007 08:24:43 +0000 (18:24 +1000)
committerAndrew Tridgell <tridge@samba.org>
Mon, 2 Jul 2007 08:24:43 +0000 (18:24 +1000)
commit18af44e37d01e428b72900797011495e71e6998d
treec806543c6c5ebef9e4fe5a9fe2759c6fcf49cc9e
parentdfebca5f49d3614751dbc7977c3fcd13867e861d
parent27ce064abd3fc7729fd7160e33f6bd7fef280305
merge from ronnie
(This used to be ctdb commit a26e638fa13b6a0b9e2aea07a1712e2e1d5a6571)