Merge branch '4-0-abartlet' into pac-verify
authorAndrew Bartlett <abartlet@samba.org>
Fri, 8 Aug 2008 04:11:16 +0000 (14:11 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Fri, 8 Aug 2008 04:11:16 +0000 (14:11 +1000)
(This used to be commit aba5fbe39c4b93ec75c66f93c46b1967091afa61)


Trivial merge