From: Brett Cannon <brett@python.org>
Date: Fri, 27 Apr 2012 21:27:33 +0000 (-0400)
Subject: merge
X-Git-Tag: v3.3.0a3~59
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=19b409a3410605380c9fdcb2e35511c9dff53fa6;p=thirdparty%2FPython%2Fcpython.git

merge
---

19b409a3410605380c9fdcb2e35511c9dff53fa6