artemp c4bae9d30a Merge branch 'master' into bigint ... Conflicts: bindings/python/mapnik_feature.cpp plugins/input/shape/dbfile.cpp		2012-12-14 10:01:21 +00:00
..
input	Merge branch 'master' into bigint	2012-12-14 10:01:21 +00:00