mapbox/tilemill — pull request #1442 by willwhite (2012-05-03 15:48:32+00:00)
Title: Master fix

Found a very strange commit 2e0bcd9badd0294e56ab4ca7055a1e7ce7e39bca, which I tried to revert in this branch. Please make sure I resolved conflicts in the right direction.