merged from peter
authorAndrew Tridgell <tridge@samba.org>
Wed, 20 Dec 2006 22:43:49 +0000 (09:43 +1100)
committerAndrew Tridgell <tridge@samba.org>
Wed, 20 Dec 2006 22:43:49 +0000 (09:43 +1100)
commit0d9ec11a5099c00603d9e97901cc14653179f40f
treef0943fc6e788489197091fe01d236457b682f2db
parente667345409e0ca2322a4f0dd8e4d358796b8b661
parent2e056a7553971be8bc064a27c8a674a0a325038b
merged from peter
(This used to be ctdb commit e6fc75581e2038e98c730a6691a1cc61c5b83afe)