merge from ronnie
authorAndrew Tridgell <tridge@samba.org>
Mon, 2 Jul 2007 08:24:43 +0000 (18:24 +1000)
committerAndrew Tridgell <tridge@samba.org>
Mon, 2 Jul 2007 08:24:43 +0000 (18:24 +1000)

Trivial merge