I'm copying my response here to continue the conversation.
Please don't remove cvs/git version.
What should be done is: 1. Leave old bugs alone or modify them case-by-case 2. All bugs with "cvs/git" version from now on can be filed on the development branch between releases only. 3. After the next release, if the bug is still present, modify version to that release. Of course no modifying of old bugs.
Vitaliy.