[mkgmap-dev] Commit: r971: Merge the POI branch to trunk.