merge from ronnie
authorAndrew Tridgell <tridge@samba.org>
Tue, 10 Jul 2007 04:59:23 +0000 (14:59 +1000)
committerAndrew Tridgell <tridge@samba.org>
Tue, 10 Jul 2007 04:59:23 +0000 (14:59 +1000)

Trivial merge