merge from ronnie
authorAndrew Tridgell <tridge@samba.org>
Thu, 12 Apr 2007 00:44:18 +0000 (10:44 +1000)
committerAndrew Tridgell <tridge@samba.org>
Thu, 12 Apr 2007 00:44:18 +0000 (10:44 +1000)

Trivial merge