From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Wed, 29 Aug 2012 13:27:07 +0000 (+0100)
Subject: Merged upstream changes.
X-Git-Tag: v2.7.4rc1~603
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a116df0f39e0bd68b04fc3fd5cd6ebff5371ae88;p=thirdparty%2FPython%2Fcpython.git

Merged upstream changes.
---

a116df0f39e0bd68b04fc3fd5cd6ebff5371ae88