From: Victor Stinner <victor.stinner@gmail.com>
Date: Sat, 12 Jul 2014 01:20:40 +0000 (+0200)
Subject: Merge with 3.4
X-Git-Tag: v3.5.0a1~1291
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e8567106c05f5dcaf397666b48bb67ea202250a2;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.4
---

e8567106c05f5dcaf397666b48bb67ea202250a2