merge from ronnie
authorAndrew Tridgell <tridge@samba.org>
Sat, 9 Jun 2007 11:31:59 +0000 (21:31 +1000)
committerAndrew Tridgell <tridge@samba.org>
Sat, 9 Jun 2007 11:31:59 +0000 (21:31 +1000)

Trivial merge