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

Merge 3.4.
---

847c1816ffd32c41b2e5ce3a771458267071b285