Drop CVS crap.
Merge pull request #3593 from ktf/drop-cvs-crap

Drop CVS crap.