Thomas Graves 03fad3c692 merge -r 1368295:1368296 from branch-2. FIXES: MAPREDUCE-4504 %!s(int64=13) %!d(string=hai) anos
..
java 03fad3c692 merge -r 1368295:1368296 from branch-2. FIXES: MAPREDUCE-4504 %!s(int64=13) %!d(string=hai) anos
resources 3e3e6770ca merge MAPREDUCE-3896 from trunk %!s(int64=13) %!d(string=hai) anos