From: Charles-François Natali <cf.natali@gmail.com>
Date: Fri, 20 Jun 2014 21:59:32 +0000 (+0100)
Subject: Merge.
X-Git-Tag: v3.4.2rc1~348
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8aa9e4268fae4646b40d230962d74a6b61397217;p=python

Merge.
---

8aa9e4268fae4646b40d230962d74a6b61397217