From 6c710f5f80f3360bbae03aa3fb808b40fbdd97d9 Mon Sep 17 00:00:00 2001
From: Aaron Myers <atm@apache.org>
Date: Thu, 17 Nov 2011 18:46:25 +0000
Subject: [PATCH] Merge trunk into HA branch.

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