Update mkgmap to version r2960
Update mkgmap-svn to version 2960