merge from ronnie
authorAndrew Tridgell <tridge@samba.org>
Wed, 16 Jan 2008 03:32:29 +0000 (14:32 +1100)
committerAndrew Tridgell <tridge@samba.org>
Wed, 16 Jan 2008 03:32:29 +0000 (14:32 +1100)

Trivial merge