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)
commitdd5cdf3c99f5bfe40c68bbc2f91ce419d27f0a05
treea8bde8bd48d76cad53c2585c5ac89935e48ea028
parent185788f416be9ab07588f70755583e9a4ec02418
parentbf0f1f6d1a6a970621e40428963923ed7341e003
Merge branch '4-0-abartlet' into pac-verify
(This used to be commit aba5fbe39c4b93ec75c66f93c46b1967091afa61)