From: Brett Cannon <brett@python.org>
Date: Sat, 25 May 2013 15:29:03 +0000 (-0400)
Subject: merge
X-Git-Tag: v3.4.0a1~637
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=21cc628e4cb0e2d8bffb99bd8d7fd2868b592983;p=thirdparty%2FPython%2Fcpython.git

merge
---

21cc628e4cb0e2d8bffb99bd8d7fd2868b592983