From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Mon, 5 Mar 2012 09:44:25 +0000 (+0000)
Subject: Merged upstream changes.
X-Git-Tag: v3.3.0a2~276^2~23^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=682c979871b42cd21856735c5900f9bee832bfb1;p=thirdparty%2FPython%2Fcpython.git

Merged upstream changes.
---

682c979871b42cd21856735c5900f9bee832bfb1