merge from ronnie
authorAndrew Tridgell <tridge@samba.org>
Wed, 22 Aug 2007 07:31:29 +0000 (17:31 +1000)
committerAndrew Tridgell <tridge@samba.org>
Wed, 22 Aug 2007 07:31:29 +0000 (17:31 +1000)

Trivial merge