From: Charles-Francois Natali <cf.natali@gmail.com>
Date: Wed, 1 May 2013 13:15:50 +0000 (+0200)
Subject: Merge.
X-Git-Tag: v3.4.0a1~820
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8a42d601888e9f71e2c1fcfe93593c509f431c15;p=python

Merge.
---

8a42d601888e9f71e2c1fcfe93593c509f431c15