merged from ronnie
authorAndrew Tridgell <tridge@samba.org>
Mon, 4 Jun 2007 03:34:27 +0000 (13:34 +1000)
committerAndrew Tridgell <tridge@samba.org>
Mon, 4 Jun 2007 03:34:27 +0000 (13:34 +1000)

Trivial merge