merge from ronnie
authorAndrew Tridgell <tridge@samba.org>
Thu, 24 May 2007 00:10:02 +0000 (10:10 +1000)
committerAndrew Tridgell <tridge@samba.org>
Thu, 24 May 2007 00:10:02 +0000 (10:10 +1000)

Trivial merge