merge from ronnie
authorAndrew Tridgell <tridge@samba.org>
Wed, 4 Jul 2007 23:59:11 +0000 (09:59 +1000)
committerAndrew Tridgell <tridge@samba.org>
Wed, 4 Jul 2007 23:59:11 +0000 (09:59 +1000)

Trivial merge