From: Brett Cannon <brett@python.org>
Date: Thu, 26 Jan 2012 23:34:34 +0000 (-0500)
Subject: Merge
X-Git-Tag: v3.3.0a1~299
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e9cd900585d44b418b2a2235a7eec6e4b362798f;p=thirdparty%2FPython%2Fcpython.git

Merge
---

e9cd900585d44b418b2a2235a7eec6e4b362798f