From ee486e8e43f4e45c6d0ea0b9814c88dbe3eebba2 Mon Sep 17 00:00:00 2001
From: Aaron Myers <atm@apache.org>
Date: Fri, 2 Mar 2012 23:09:07 +0000
Subject: [PATCH] Merge trunk into HA branch.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1296510 13f79535-47bb-0310-9956-ffa450edef68