Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into pac-verify
authorAndrew Bartlett <abartlet@samba.org>
Tue, 26 Aug 2008 06:26:08 +0000 (16:26 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Tue, 26 Aug 2008 06:26:08 +0000 (16:26 +1000)
(This used to be commit b706708210a05d6f10474a3cd2bbc550704d4356)


Trivial merge