Yelp/mrjob — pull request #496 by irskep (2012-07-03 18:42:10+00:00)
Title: Merge current release-v0.3.5 into master (0.4)

I had to fix some merge conflicts related to the exception hierarchy.