fixed merge
authorAndrew Tridgell <tridge@samba.org>
Mon, 11 Aug 2008 14:10:48 +0000 (00:10 +1000)
committerAndrew Tridgell <tridge@samba.org>
Mon, 11 Aug 2008 14:10:48 +0000 (00:10 +1000)

Trivial merge