merge from ronnie
authorAndrew Tridgell <tridge@samba.org>
Tue, 17 Apr 2007 02:53:04 +0000 (12:53 +1000)
committerAndrew Tridgell <tridge@samba.org>
Tue, 17 Apr 2007 02:53:04 +0000 (12:53 +1000)

Trivial merge