merged changes from peter
authorAndrew Tridgell <tridge@samba.org>
Thu, 8 Mar 2007 00:27:15 +0000 (11:27 +1100)
committerAndrew Tridgell <tridge@samba.org>
Thu, 8 Mar 2007 00:27:15 +0000 (11:27 +1100)

Trivial merge