Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into pac-verify
authorAndrew Bartlett <abartlet@samba.org>
Wed, 27 Aug 2008 01:01:55 +0000 (11:01 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Wed, 27 Aug 2008 01:01:55 +0000 (11:01 +1000)
(This used to be commit 32143287c7eb452c6ed9ccd15e8cd4e5a907b437)


Trivial merge