From: Brett Cannon <brett@python.org>
Date: Tue, 3 Apr 2012 00:34:20 +0000 (-0400)
Subject: merge
X-Git-Tag: v3.3.0a3~328^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5ceef131d42852fc1db1de0dd565196c4e29a397;p=thirdparty%2FPython%2Fcpython.git

merge
---

5ceef131d42852fc1db1de0dd565196c4e29a397