From: Brett Cannon <brett@python.org>
Date: Fri, 18 Oct 2013 15:39:32 +0000 (-0400)
Subject: merge
X-Git-Tag: v3.4.0a4~58
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=af002e6482fbd6f6c6e87c69c72d3097578a29fe;p=thirdparty%2FPython%2Fcpython.git

merge
---

af002e6482fbd6f6c6e87c69c72d3097578a29fe