pullup from trunk To generate a diff of this commit: cvs diff -r1.19.2.4 -r1.19.2.5 krb5/src/windows/gss/ChangeLog cvs diff -r1.12.2.2 -r1.12.2.3 krb5/src/windows/gss/Makefile.in