From: Brett Cannon <brett@python.org>
Date: Thu, 26 Jan 2012 13:58:19 +0000 (-0500)
Subject: Merge
X-Git-Tag: v3.3.0a1~299^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7f2b576875ce7cab03cdbea3984edbd801045a24;p=thirdparty%2FPython%2Fcpython.git

Merge
---

7f2b576875ce7cab03cdbea3984edbd801045a24