pull up r17441 from trunk Commit By: tlyu Revision: 17444 Changed Files: U branches/krb5-1-4/src/include/ChangeLog U branches/krb5-1-4/src/include/win-mac.h