Commit By: tlyu Log Message: ticket: 4407 fix mis-merge Changed Files: _U branches/krb5-1-4/ U branches/krb5-1-4/src/windows/identity/config/Makefile.w2k U branches/krb5-1-4/src/windows/identity/config/Makefile.w32