merge from vl
authorAndrew Tridgell <tridge@samba.org>
Thu, 12 Apr 2007 00:51:55 +0000 (10:51 +1000)
committerAndrew Tridgell <tridge@samba.org>
Thu, 12 Apr 2007 00:51:55 +0000 (10:51 +1000)
(This used to be ctdb commit 8b5233fbe773893d1bc6b377f8956fe0b3e503ab)


Trivial merge