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


Trivial merge