From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Sat, 19 May 2012 15:52:33 +0000 (+0100)
Subject: Merged upstream changes.
X-Git-Tag: v2.7.4rc1~805
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7961bb304370dddd896877155bc13e2828525195;p=thirdparty%2FPython%2Fcpython.git

Merged upstream changes.
---

7961bb304370dddd896877155bc13e2828525195