From: Charles-François Natali <neologix@free.fr>
Date: Tue, 4 Oct 2011 21:37:43 +0000 (+0200)
Subject: Merge.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4637309ee66381d081e3e86f72665ca08fc6e634;p=python

Merge.
---

4637309ee66381d081e3e86f72665ca08fc6e634