From: Brett Cannon <brett@python.org>
Date: Sun, 16 Jun 2013 23:07:16 +0000 (-0400)
Subject: merge
X-Git-Tag: v3.4.0a1~468^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a269d821a11f2f84e6a211818ac1fdd76e0ab647;p=thirdparty%2FPython%2Fcpython.git

merge
---

a269d821a11f2f84e6a211818ac1fdd76e0ab647