merge from ronnie
authorAndrew Tridgell <tridge@samba.org>
Mon, 27 Aug 2007 08:04:53 +0000 (18:04 +1000)
committerAndrew Tridgell <tridge@samba.org>
Mon, 27 Aug 2007 08:04:53 +0000 (18:04 +1000)
(This used to be ctdb commit ab11fd70cf4d2165a5b55930cbad6fddf5397f54)


Trivial merge