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:28:59 +0000 (16:28 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Tue, 26 Aug 2008 06:28:59 +0000 (16:28 +1000)
(This used to be commit 2a1adaa759d9201670519b3938109e13c0476a83)


Trivial merge