artemp 90b0e65841 Merge branch 'master' into clipper
Conflicts:
	include/mapnik/vertex_converters.hpp
2013-02-19 09:08:17 +00:00
..
2013-02-19 09:08:17 +00:00