I'd prefer just not to touch it before 2.10 at this point. There will be a cvs tag for 2.10 anyway. Let's just use the old cvs method for this one last time. Then we can revisit this next week and hash new things out under git. Ok, will do so.