[mkgmap-dev] Include the following patches into trunk -- Patch2 - do not merge lines at resolution 24 and 23 if --merge-lines is used