From: Georg Brandl <georg@python.org>
Date: Thu, 6 Nov 2014 14:33:35 +0000 (+0100)
Subject: merge with 3.4
X-Git-Tag: v3.5.0a1~510
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9f2e0d6a86c8384fec5f0e35e0487295d74c3315;p=thirdparty%2FPython%2Fcpython.git

merge with 3.4
---

9f2e0d6a86c8384fec5f0e35e0487295d74c3315