pullup from trunk To generate a diff of this commit: cvs diff -r5.147.2.1 -r5.147.2.2 krb5/src/lib/kdb/ChangeLog cvs diff -r5.16.2.1 -r5.16.2.2 krb5/src/lib/kdb/keytab.c