From: Brett Cannon <brett@python.org>
Date: Wed, 18 Apr 2012 01:42:07 +0000 (-0400)
Subject: Merge
X-Git-Tag: v3.3.0a3~173
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=03c7ed15803def1eedec65522e6185fc5a1badf9;p=thirdparty%2FPython%2Fcpython.git

Merge
---

03c7ed15803def1eedec65522e6185fc5a1badf9