update
Merge branch 'master' of github.com:niles2005/mapserver