Change text-margin option to margin.
Merge branch 'min-dist-compatibility' of git://github.com/MapQuest/mapnik into MapQuest-min-dist-compatibility
Merge branch 'MapQuest-min-dist-compatibility'