From: Martin v. Löwis <martin@v.loewis.de>
Date: Sun, 30 Mar 2014 19:15:26 +0000 (+0200)
Subject: Merge 3.4 (#16047)
X-Git-Tag: v3.5.0a1~1985
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=669b0950314d416d7d9d16284056e1934a30d2b8;p=thirdparty%2FPython%2Fcpython.git

Merge 3.4 (#16047)
---

669b0950314d416d7d9d16284056e1934a30d2b8