Merge branch 'abartlet-4-0-local' into v4-0-test
authorAndrew Tridgell <tridge@samba.org>
Fri, 22 Aug 2008 07:37:43 +0000 (17:37 +1000)
committerAndrew Tridgell <tridge@samba.org>
Fri, 22 Aug 2008 07:37:43 +0000 (17:37 +1000)
(This used to be commit 469fac2669991b130dec219e1a109a8b2ce224be)


Trivial merge