Update mkgmap to version r2961
Update mkgmap-svn to version 2961