Konstantin Käfer 13c46b6cc6 Merge branch 'master' into conv_simplify ... Conflicts: bindings/python/mapnik_line_symbolizer.cpp bindings/python/mapnik_polygon_symbolizer.cpp		2012-08-24 23:29:43 +02:00
..
mapnik	Merge branch 'master' into conv_simplify	2012-08-24 23:29:43 +02:00