From: Brett Cannon <brett@python.org>
Date: Tue, 7 Feb 2012 14:20:20 +0000 (-0500)
Subject: Merge
X-Git-Tag: v3.3.0a1~232
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3fd6e2b9108e8c2df1b584868c5fc830f2afb7e1;p=thirdparty%2FPython%2Fcpython.git

Merge
---

3fd6e2b9108e8c2df1b584868c5fc830f2afb7e1