From: Charles-François Natali <cf.natali@gmail.com>
Date: Thu, 19 Jun 2014 21:45:09 +0000 (+0100)
Subject: Merge.
X-Git-Tag: v2.7.8~37
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e4cda6ce21dc268e308f0ee95e097f667f680d43;p=python

Merge.
---

e4cda6ce21dc268e308f0ee95e097f667f680d43