From: Brett Cannon <brett@python.org>
Date: Fri, 14 Jun 2013 22:33:21 +0000 (-0400)
Subject: merge
X-Git-Tag: v3.4.0a1~506
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8c18da20f979cf428414a038bfaee46283e12fa2;p=thirdparty%2FPython%2Fcpython.git

merge
---

8c18da20f979cf428414a038bfaee46283e12fa2