merge from ronnie
authorAndrew Tridgell <tridge@samba.org>
Fri, 8 Jun 2007 03:13:59 +0000 (13:13 +1000)
committerAndrew Tridgell <tridge@samba.org>
Fri, 8 Jun 2007 03:13:59 +0000 (13:13 +1000)

Trivial merge