Thomas Graves 93af1a43be merge -r 1309400:1309401 from trunk. FIXES: MAPREDUCE-3672 %!s(int64=13) %!d(string=hai) anos
..
main 93af1a43be merge -r 1309400:1309401 from trunk. FIXES: MAPREDUCE-3672 %!s(int64=13) %!d(string=hai) anos
test c471c3d15f merge MAPREDUCE-3903 from trunk %!s(int64=13) %!d(string=hai) anos