Pull up r17533 from trunk.

Commit By: tlyu



Revision: 17540
Changed Files:
U   branches/krb5-1-4/src/windows/installer/wix/config.wxi
U   branches/krb5-1-4/src/windows/installer/wix/custom/custom.cpp
U   branches/krb5-1-4/src/windows/installer/wix/custom/custom.h
U   branches/krb5-1-4/src/windows/installer/wix/features.wxi
U   branches/krb5-1-4/src/windows/installer/wix/files.wxi
U   branches/krb5-1-4/src/windows/installer/wix/kfw.wxs
A   branches/krb5-1-4/src/windows/installer/wix/lang/license.rtf
U   branches/krb5-1-4/src/windows/installer/wix/lang/strings_1033.wxl
U   branches/krb5-1-4/src/windows/installer/wix/lang/ui_1033.wxi
U   branches/krb5-1-4/src/windows/installer/wix/property.wxi