Hermann Kraus 9eccd58ed5 Merge branch 'textplacement-rename' into python-textplacement ... Conflicts: include/mapnik/text_processing.hpp		2012-02-12 04:01:58 +01:00
..
mapnik	Merge branch 'textplacement-rename' into python-textplacement	2012-02-12 04:01:58 +01:00