merge from ronnie
authorAndrew Tridgell <tridge@samba.org>
Mon, 22 Oct 2007 00:26:25 +0000 (10:26 +1000)
committerAndrew Tridgell <tridge@samba.org>
Mon, 22 Oct 2007 00:26:25 +0000 (10:26 +1000)

Trivial merge