From: Brett Cannon <brett@python.org>
Date: Tue, 15 Mar 2011 21:23:21 +0000 (-0400)
Subject: merge
X-Git-Tag: v3.3.0a1~2903
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f434ba9e4ef5a68940757ba5e3527dd02fdb53ca;p=thirdparty%2FPython%2Fcpython.git

merge
---

f434ba9e4ef5a68940757ba5e3527dd02fdb53ca