From: Charles-François Natali <neologix@free.fr>
Date: Wed, 12 Oct 2011 19:10:02 +0000 (+0200)
Subject: Merge.
X-Git-Tag: v2.7.3rc1~407
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=46180751e92bfb45dfe2c324210825db7937e5e7;p=python

Merge.
---

46180751e92bfb45dfe2c324210825db7937e5e7