c++ style
Merge branch 'master' of github.com:mapnik/mapnik into map-request