Fix mis-merged ChangeLog.