tree d472e901ce7206688a2bb9e75829b017801a73ad
parent f4ce7e4fe3e90460b704d5f09e63b2500cf7be02
author Devaraj Das <ddas@apache.org> 1311622379 +0000
committer Devaraj Das <ddas@apache.org> 1311622379 +0000

Merge -r 1150859:1150860 from branch-0.20-security onto branch-0.20-security-204

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.20-security-204@1150862 13f79535-47bb-0310-9956-ffa450edef68