Partly revert the merge-lines-v2.patch: don't merge roads, this causes
wrong NET data and wrong placement of cursor in MapSource when
pointing on a road in lower resolutions.

git-svn-id: http://svn.mkgmap.org.uk/mkgmap/trunk@2754 25d90789-57f7-4ee0-8453-03a3dfeeeb22