Hermann Kraus 723b89f151 Merge commit '6b84269343cbd7a8aa165e3b4788d6a64b6c1e55' into harfbuzz ... Conflicts: src/placement_finder.cpp		2013-03-16 13:06:39 +01:00
..
mapnik	Merge commit '6b84269343cbd7a8aa165e3b4788d6a64b6c1e55' into harfbuzz	2013-03-16 13:06:39 +01:00
build.py	Merge commit '57aa6dd05230876bf7c022d3554436e4d35de77f' into harfbuzz	2013-03-16 12:46:01 +01:00