[mkgmap-dev] Commit: r2754: Partly revert the merge-lines-v2.patch: don't merge roads, this causes