From: Victor Stinner <victor.stinner@gmail.com>
Date: Wed, 14 May 2014 21:37:14 +0000 (+0200)
Subject: Merge 3.4
X-Git-Tag: v3.5.0a1~1652
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8e4efbe115b0062d08c394fbdb6b39bb39304fd3;p=python

Merge 3.4
---

8e4efbe115b0062d08c394fbdb6b39bb39304fd3