From: Brett Cannon <brett@python.org>
Date: Fri, 13 Apr 2012 01:13:08 +0000 (-0400)
Subject: Merge
X-Git-Tag: v3.3.0a3~243
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=15af26fa9247a5f61bc992004d17f86f10464567;p=thirdparty%2FPython%2Fcpython.git

Merge
---

15af26fa9247a5f61bc992004d17f86f10464567