merge from ronnie
authorAndrew Tridgell <tridge@samba.org>
Thu, 30 Aug 2007 07:16:23 +0000 (17:16 +1000)
committerAndrew Tridgell <tridge@samba.org>
Thu, 30 Aug 2007 07:16:23 +0000 (17:16 +1000)

Trivial merge