Re: [mkgmap-dev] Merge locator branch back to trunk