From: Brett Cannon <brett@python.org>
Date: Fri, 27 Jan 2012 00:09:44 +0000 (-0500)
Subject: Merge
X-Git-Tag: v3.3.0a1~297
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c9f71481d407d08a3c51888f3bfe8575964be7ab;p=thirdparty%2FPython%2Fcpython.git

Merge
---

c9f71481d407d08a3c51888f3bfe8575964be7ab