In addition:
- Restore CVS keyword expansions that were lost during the switch to Mercurial
- Update texinfo sources for texinfo 5.x

See <CAHCOHQmqMvFtLqEt6M+w4vFyq9=e+i1Uy8zaQcUeAjeV3F9uWQ@mail.gmail.com> in
xemacs-patches and followups for details.