Hermann Kraus d3e191ff73 Merge branch 'master' into python-textplacement ... Conflicts: include/mapnik/formatting/list.hpp		2012-02-12 22:58:02 +01:00
..
mapnik	Merge branch 'master' into python-textplacement	2012-02-12 22:58:02 +01:00