merge from ronnie
authorAndrew Tridgell <tridge@samba.org>
Tue, 23 Oct 2007 01:45:36 +0000 (11:45 +1000)
committerAndrew Tridgell <tridge@samba.org>
Tue, 23 Oct 2007 01:45:36 +0000 (11:45 +1000)

Trivial merge