Merge commit 'sofs1/tridge'
authorAndrew Tridgell <tridge@samba.org>
Thu, 8 May 2008 07:15:41 +0000 (17:15 +1000)
committerAndrew Tridgell <tridge@samba.org>
Thu, 8 May 2008 07:15:41 +0000 (17:15 +1000)

Trivial merge