FL-1209: tweak CVS merge path feature to work, hopefully
Merge branch 'master' of git.funtoo.org:funtoo-overlay