From: Charles-François Natali <neologix@free.fr>
Date: Sun, 20 May 2012 09:43:28 +0000 (+0200)
Subject: Merge.
X-Git-Tag: v3.3.0a4~110
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6c7bf42656fccf5c0f09de17e5912e17dce56648;p=python

Merge.
---

6c7bf42656fccf5c0f09de17e5912e17dce56648