Artem Pavlenko a72ee4ba66 Merge branch 'master' into compositing ... Conflicts: include/mapnik/image_compositing.hpp include/mapnik/util/conversions.hpp include/mapnik/value.hpp src/agg/agg_renderer.cpp src/agg/process_line_symbolizer.cpp src/agg/process_polygon_symbolizer.cpp src/png_reader.cpp src/svg_parser.cpp utils/svg2png/svg2png.cpp		2012-05-01 12:35:49 +01:00
..
python	Merge branch 'master' into compositing	2012-05-01 12:35:49 +01:00