merge from ronnie
authorAndrew Tridgell <tridge@samba.org>
Tue, 17 Apr 2007 01:54:19 +0000 (11:54 +1000)
committerAndrew Tridgell <tridge@samba.org>
Tue, 17 Apr 2007 01:54:19 +0000 (11:54 +1000)
(This used to be ctdb commit d854392b04c46bcdd008cced5d16a03d81f97bd0)


Trivial merge