merge from ronnie
authorAndrew Tridgell <tridge@samba.org>
Thu, 17 May 2007 02:46:50 +0000 (12:46 +1000)
committerAndrew Tridgell <tridge@samba.org>
Thu, 17 May 2007 02:46:50 +0000 (12:46 +1000)

Trivial merge