Preparing to merge HADOOP-2103 into branch-0.15.
Preparing to merge HADOOP-2103 into branch-0.15.


git-svn-id: 4d48d1092ee340c9ada5711cdbe4355b138bc22b@589548 13f79535-47bb-0310-9956-ffa450edef68

awylie/hadoop,awylie/hadoop,awylie/hadoop,awylie/hadoop,awylie/hadoop,awylie/hadoop,awylie/hadoop,awylie/hadoop,awylie/hadoop,awylie/hadoop