merge from peter
authorAndrew Tridgell <tridge@samba.org>
Sat, 16 Dec 2006 00:21:24 +0000 (11:21 +1100)
committerAndrew Tridgell <tridge@samba.org>
Sat, 16 Dec 2006 00:21:24 +0000 (11:21 +1100)
commit43654fa5968b72dcd4fafa931224c7499cafea82
tree9241a44a96a65761ac4b1f5fd0da135f21220b76
parent4777809b6251e6a45142247ab637ca7b1b16174e
parent0e1b3f1f12169e462134c5e8608016bcc46d355b
merge from peter
(This used to be ctdb commit c690d4bbc4b6279d7fdce28b017566ea9bd65ef5)