fix mis-merge
authorTom Yu <tlyu@mit.edu>
Wed, 11 Oct 2006 20:08:18 +0000 (20:08 +0000)
committerTom Yu <tlyu@mit.edu>
Wed, 11 Oct 2006 20:08:18 +0000 (20:08 +0000)
commit1345aa6ce2a47f469bbbca8e03008667e133900f
tree5f788ae008190a1e6d145c296601b3e0ebcac662
parenta783174fbe89274cf4ecf76334cb99adedcfcfe9
fix mis-merge

ticket: 4407

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-4@18683 dc483132-0cff-0310-8789-dd5450dbe970