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

merge
---

4f9b4343ed07bd6908cf7d679fa1d50484831294