FL-1346: from Arfrever -- use cvs for merging gentoo changes, but allow easy switch back to rsync