From: Charles-François Natali <cf.natali@gmail.com>
Date: Fri, 25 Jul 2014 17:45:02 +0000 (+0100)
Subject: Merge.
X-Git-Tag: v3.4.2rc1~190
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e396c363cbacce68d7750a7963af4d7cd3bf30e7;p=python

Merge.
---

e396c363cbacce68d7750a7963af4d7cd3bf30e7