From: Georg Brandl <georg@python.org>
Date: Fri, 28 Mar 2014 18:49:02 +0000 (+0100)
Subject: merge with 3.4
X-Git-Tag: v3.5.0a1~2007
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=aa1403c440dc1fce80ee08c790ed3c20ebea753e;p=thirdparty%2FPython%2Fcpython.git

merge with 3.4
---

aa1403c440dc1fce80ee08c790ed3c20ebea753e