Fix TODO merge conflicts, I hope. trunk

Release 6.2 trunk

Update TODO trunk

(0) -30 -10 -3 +3 +10 +30 tip

mercurial