From: Brett Cannon <brett@python.org>
Date: Sun, 22 Apr 2012 17:30:07 +0000 (-0400)
Subject: merge
X-Git-Tag: v3.3.0a3~113
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8c5e920ae3e98ebc5b37a105cf86e4c1e9649f57;p=thirdparty%2FPython%2Fcpython.git

merge
---

8c5e920ae3e98ebc5b37a105cf86e4c1e9649f57