merge from ronnie
authorAndrew Tridgell <tridge@samba.org>
Wed, 4 Jul 2007 04:51:33 +0000 (14:51 +1000)
committerAndrew Tridgell <tridge@samba.org>
Wed, 4 Jul 2007 04:51:33 +0000 (14:51 +1000)

Trivial merge