From: Brett Cannon <brett@python.org>
Date: Sun, 29 Apr 2012 16:50:32 +0000 (-0400)
Subject: merge
X-Git-Tag: v3.3.0a3~36
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=119d026bf64a6bc1e8e4a2311dcab2d830d089c6;p=thirdparty%2FPython%2Fcpython.git

merge
---

119d026bf64a6bc1e8e4a2311dcab2d830d089c6