From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Thu, 23 Feb 2012 20:55:35 +0000 (+0000)
Subject: Merged upstream changes.
X-Git-Tag: v3.3.0a1~81^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a751885e0e89e65ecd115729d1542a0160eb67af;p=thirdparty%2FPython%2Fcpython.git

Merged upstream changes.
---

a751885e0e89e65ecd115729d1542a0160eb67af