[mkgmap-dev] Commit r4390: merge branch default-typ with latest TYP file mapnik.txt from Joris Bo