Update mkgmap to version r2658
Update mkgmap-svn to version 2761. Fix typo.