[mkgmap-dev] Commit r4360: merge the NET-no-NOD branch