merged from ronnie
authorAndrew Tridgell <tridge@samba.org>
Sun, 3 Jun 2007 10:54:24 +0000 (20:54 +1000)
committerAndrew Tridgell <tridge@samba.org>
Sun, 3 Jun 2007 10:54:24 +0000 (20:54 +1000)

Trivial merge