[mkgmap-dev] Merge style-functions into trunk