From 35206c716e85547360063c6566697a529d9bd09d Mon Sep 17 00:00:00 2001
From: Aaron Myers <atm@apache.org>
Date: Mon, 19 Dec 2011 07:19:36 +0000
Subject: [PATCH] Merge trunk into HA branch.

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