pullup from trunk To generate a diff of this commit: cvs diff -r1.4.2.2 -r1.4.2.3 krb5/src/lib/crypto/aes/ChangeLog cvs diff -r1.1.2.1 -r1.1.2.2 krb5/src/lib/crypto/aes/aes_s2k.c