Thomas Graves d72f0e629f merge -r 1338840:1338841 from branch-2. FIXES: MAPREDUCE-4238 %!s(int64=13) %!d(string=hai) anos
..
ivy cd7157784e HADOOP-7560. Change src layout to be heirarchical. Contributed by Alejandro Abdelnur. %!s(int64=14) %!d(string=hai) anos
build.xml cd7157784e HADOOP-7560. Change src layout to be heirarchical. Contributed by Alejandro Abdelnur. %!s(int64=14) %!d(string=hai) anos
ivy.xml cd7157784e HADOOP-7560. Change src layout to be heirarchical. Contributed by Alejandro Abdelnur. %!s(int64=14) %!d(string=hai) anos