pullup from trunk To generate a diff of this commit: cvs diff -r5.412.2.5 -r5.412.2.6 krb5/src/lib/krb5/os/ChangeLog cvs diff -r5.1 -r5.1.4.1 krb5/src/lib/krb5/os/dnsglue.h