merge from ronnie
authorAndrew Tridgell <tridge@samba.org>
Sat, 2 Jun 2007 08:08:16 +0000 (18:08 +1000)
committerAndrew Tridgell <tridge@samba.org>
Sat, 2 Jun 2007 08:08:16 +0000 (18:08 +1000)

Trivial merge