Artem Pavlenko 9840c7df4c Merge branch 'master' into compositing ... Conflicts: include/mapnik/util/dasharray_parser.hpp src/agg/process_line_symbolizer.cpp src/image_compositing.cpp		2012-03-26 09:05:02 +01:00
..
python	Merge branch 'master' into compositing	2012-03-26 09:05:02 +01:00