Merge branch 'v4-0-logon' of git://git.id10ts.net/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Wed, 19 Mar 2008 00:04:42 +0000 (11:04 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Wed, 19 Mar 2008 00:04:42 +0000 (11:04 +1100)
(This used to be commit 8252b51850f108aa8f43ec25c752a411c32f9764)

1  2 
source4/heimdal/kdc/kerberos5.c

Simple merge