pullup from trunk To generate a diff of this commit: cvs diff -r1.65.2.3 -r1.65.2.4 krb5/src/appl/gss-sample/ChangeLog cvs diff -r1.25.2.1 -r1.25.2.2 krb5/src/appl/gss-sample/gss-client.c