From: Brett Cannon <brett@python.org>
Date: Mon, 1 Apr 2013 17:26:21 +0000 (-0400)
Subject: merge
X-Git-Tag: v3.4.0a1~1051
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a495b498afa3ab0e2424cad0fb2fa3caacf7fd08;p=thirdparty%2FPython%2Fcpython.git

merge
---

a495b498afa3ab0e2424cad0fb2fa3caacf7fd08