Pull up r16892 form trunk. Commit By: tlyu Revision: 17514 Changed Files: U branches/krb5-1-4/src/include/ChangeLog U branches/krb5-1-4/src/include/win-mac.h