From: Brett Cannon <brett@python.org>
Date: Tue, 31 Jan 2012 19:58:07 +0000 (-0500)
Subject: Merge
X-Git-Tag: v3.3.0a1~273
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cdf11210769906137da2c6815abd4585c6ceb88e;p=thirdparty%2FPython%2Fcpython.git

Merge
---

cdf11210769906137da2c6815abd4585c6ceb88e