so do any necessary cross-pollination and then just make one a symlink to the other. svn path=/trunk/; revision=45353
svn path=/trunk/; revision=45352
those people using bzr. svn path=/trunk/; revision=45120