From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Mon, 20 Feb 2012 18:51:00 +0000 (+0000)
Subject: Merged upstream changes.
X-Git-Tag: v3.3.0a1~123
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3443fe60c7e0a232fb383a5a2e5c4156562bbc14;p=thirdparty%2FPython%2Fcpython.git

Merged upstream changes.
---

3443fe60c7e0a232fb383a5a2e5c4156562bbc14