tree aaafce92c9ad5eefc6ef6db89376997d0abc02c6
parent f2cb70663949d9f362707be315c8eee11abff8d9
author Devaraj Das <ddas@apache.org> 1291190832 +0000
committer Devaraj Das <ddas@apache.org> 1291190832 +0000

Merge -r 1040882:1040883 from trunk onto 0.22 branch.

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