From: Brett Cannon <brett@python.org>
Date: Mon, 9 Jul 2012 20:09:21 +0000 (-0400)
Subject: Merge
X-Git-Tag: v3.3.0b2~250
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bc8e09708bb09dc56adaf04081462f26f834e372;p=thirdparty%2FPython%2Fcpython.git

Merge
---

bc8e09708bb09dc56adaf04081462f26f834e372