pullup from trunk To generate a diff of this commit: cvs diff -r1.168.2.6 -r1.168.2.7 krb5/src/util/profile/ChangeLog cvs diff -r1.47.2.3 -r1.47.2.4 krb5/src/util/profile/prof_file.c cvs diff -r1.40.2.1 -r1.40.2.2 krb5/src/util/profile/prof_int.h cvs diff -r1.27.4.1 -r1.27.4.2 krb5/src/util/profile/prof_tree.c