Merge branch 'master' into lukeh/acquire-cred-ex
commit3069d80734aaedad61c719d4ad0b8d71ea236e35
authorLuke Howard <lukeh@padl.com>
Sat, 14 May 2011 12:56:16 +0000 (14 14:56 +0200)
committerLuke Howard <lukeh@padl.com>
Sat, 14 May 2011 12:56:16 +0000 (14 14:56 +0200)
treef679815d5e810de4f73146e5d9ca0cc551d03f6b
parentd8ff5844f718886717d9a7442a7228563dd2beee
parentd1b553aae251bfcce1b61d0c9ac2248a7fe9933d
Merge branch 'master' into lukeh/acquire-cred-ex
lib/gssapi/krb5/external.c
lib/gssapi/mech/gss_mech_switch.c
lib/gssapi/mech/gss_oid.c
lib/gssapi/test_context.c