pullup from trunk To generate a diff of this commit: cvs diff -r5.412.2.6 -r5.412.2.7 krb5/src/lib/krb5/os/ChangeLog cvs diff -r5.37 -r5.37.10.1 krb5/src/lib/krb5/os/sn2princ.c