From: Charles-François Natali <cf.natali@gmail.com>
Date: Sun, 25 Aug 2013 16:28:44 +0000 (+0200)
Subject: Merge.
X-Git-Tag: v3.4.0a2~117
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a439b32cf02a78ca326d131897c3e5b1883210f2;p=python

Merge.
---

a439b32cf02a78ca326d131897c3e5b1883210f2