[mkgmap-dev] Commit r4158: expr-func2.patch by Steve Ratcliffe