Konstantin Käfer f7cdee8312 Merge branch 'master' into grouped-rendering ... Conflicts: include/mapnik/feature_type_style.hpp src/feature_type_style.cpp		2011-12-07 22:02:29 +01:00
..
mapnik	Merge branch 'master' into grouped-rendering	2011-12-07 22:02:29 +01:00