another cvs bugfix on my branch
Merge remote-tracking branch 'schmonz/cvs'
cvs: Various fixes.