From: Barry Warsaw <barry@python.org>
Date: Tue, 19 Jul 2011 23:25:25 +0000 (-0400)
Subject: Upstream merge.
X-Git-Tag: v3.3.0a1~1872
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6d744261e2bd0fd34c826f8b39d3326dd502fe50;p=thirdparty%2FPython%2Fcpython.git

Upstream merge.
---

6d744261e2bd0fd34c826f8b39d3326dd502fe50