pypy-2.4.0
Merge pull request #5 from heroku/master

Pull from upstream