merge from ronnie
authorAndrew Tridgell <tridge@samba.org>
Fri, 3 Aug 2007 03:18:44 +0000 (13:18 +1000)
committerAndrew Tridgell <tridge@samba.org>
Fri, 3 Aug 2007 03:18:44 +0000 (13:18 +1000)

Trivial merge