merge from peter
authorAndrew Tridgell <tridge@samba.org>
Thu, 26 Apr 2007 15:13:58 +0000 (17:13 +0200)
committerAndrew Tridgell <tridge@samba.org>
Thu, 26 Apr 2007 15:13:58 +0000 (17:13 +0200)

Trivial merge