From: Brett Cannon <brett@python.org>
Date: Sun, 16 Jun 2013 17:14:06 +0000 (-0400)
Subject: merge
X-Git-Tag: v3.4.0a1~474
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=645ab68f25457b24f2dadfa3e6911cebac30d33e;p=thirdparty%2FPython%2Fcpython.git

merge
---

645ab68f25457b24f2dadfa3e6911cebac30d33e