From: Charles-François Natali <neologix@free.fr>
Date: Thu, 2 Feb 2012 19:37:29 +0000 (+0100)
Subject: Merge.
X-Git-Tag: v3.2.3rc1~98
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=227e377b36378d4cc86c3dd182f8d7c031e41f86;p=python

Merge.
---

227e377b36378d4cc86c3dd182f8d7c031e41f86