MAPREDUCE-5743. Fixed CHANGES.txt to give credit to Ted too. svn merge --ignore-ancestry -c 1565401 ../../trunk/