This should be all that remains of the 1-2-2-branch merge; some additional sanity-checking of merge needed though. * krb5_32.def: Merge from 1-2-2-branch. To generate a diff of this commit: cvs diff -r1.115 -r1.116 krb5/src/lib/ChangeLog cvs diff -r1.29 -r1.30 krb5/src/lib/krb5_32.def