merge from ronnie
authorAndrew Tridgell <tridge@samba.org>
Wed, 9 May 2007 01:54:37 +0000 (11:54 +1000)
committerAndrew Tridgell <tridge@samba.org>
Wed, 9 May 2007 01:54:37 +0000 (11:54 +1000)

Trivial merge