merge from Peter
authorAndrew Tridgell <tridge@samba.org>
Tue, 19 Dec 2006 23:35:27 +0000 (10:35 +1100)
committerAndrew Tridgell <tridge@samba.org>
Tue, 19 Dec 2006 23:35:27 +0000 (10:35 +1100)

Trivial merge