From: Charles-François Natali <neologix@free.fr>
Date: Wed, 2 May 2012 18:51:59 +0000 (+0200)
Subject: Merge.
X-Git-Tag: v3.3.0a4~311
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=598b2f6bd02b1aa118263538fa9e33769da553df;p=python

Merge.
---

598b2f6bd02b1aa118263538fa9e33769da553df