Yelp/mrjob — pull request #540 by irskep (2012-08-22 17:34:33+00:00)
Title: Merge release-v0.3.5

Please double check the most recent commit for bad merge resolutions. Don't bother with the whole diff.