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

Merged upstream changes.
---

349c900ed0e3b4b2071e4259d02b5474f7f7a0ec