pullup from trunk To generate a diff of this commit: cvs diff -r5.412.2.1 -r5.412.2.2 krb5/src/lib/krb5/os/ChangeLog cvs diff -r5.83.2.1 -r5.83.2.2 krb5/src/lib/krb5/os/locate_kdc.c