From: Martin v. Löwis <martin@v.loewis.de>
Date: Mon, 9 Feb 2015 07:10:32 +0000 (+0100)
Subject: Merge with 3.4
X-Git-Tag: v3.5.0a2~179
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=54576da2b4893d1ca6d3d0c6fe6e87be9480f933;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.4
---

54576da2b4893d1ca6d3d0c6fe6e87be9480f933