pullup from trunk To generate a diff of this commit: cvs diff -r5.455.2.4 -r5.455.2.5 krb5/src/lib/krb5/krb/ChangeLog cvs diff -r5.17 -r5.17.4.1 krb5/src/lib/krb5/krb/gic_keytab.c