I have applied both of these patches in slightly modified form in rev:4117:

As the 'CVS' directories are gone now, the only ones that need to be
filtered are 'hidden' files, i.e. those starting with '.'.