From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Thu, 23 Feb 2012 20:55:58 +0000 (+0000)
Subject: Merged upstream changes.
X-Git-Tag: v2.7.4rc1~1022
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=93fa159a43cd05c183e54a2d8f4a5a794d254512;p=thirdparty%2FPython%2Fcpython.git

Merged upstream changes.
---

93fa159a43cd05c183e54a2d8f4a5a794d254512