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)
(This used to be ctdb commit c690d4bbc4b6279d7fdce28b017566ea9bd65ef5)


Trivial merge