Artem Pavlenko 50b5d06a48 Merge remote-tracking branch 'origin/feature_impl' into feature_impl ... Conflicts: include/mapnik/feature.hpp		2012-01-17 12:39:16 -05:00
..
input	Merge remote-tracking branch 'origin/feature_impl' into feature_impl	2012-01-17 12:39:16 -05:00