From: Charles-François Natali <cf.natali@gmail.com>
Date: Thu, 29 Aug 2013 17:26:37 +0000 (+0200)
Subject: Merge.
X-Git-Tag: v3.4.0a2~78^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e33d5b0bc8b4eeb2a3072757c83d6efc30e28599;p=python

Merge.
---

e33d5b0bc8b4eeb2a3072757c83d6efc30e28599