[mkgmap-dev] Commit: r842: Re-integrate the routing branch back into the trunk.