artemp 29423cfc1c Merge branch 'master' into conv_simplify ... Conflicts: bindings/python/mapnik_markers_symbolizer.cpp plugins/input/ogr/ogr_index_featureset.cpp plugins/input/shape/dbfile.cpp plugins/input/shape/shapefile.hpp src/load_map.cpp		2012-09-07 16:46:02 +01:00
..
python	Merge branch 'master' into conv_simplify	2012-09-07 16:46:02 +01:00