From: Charles-François Natali <neologix@free.fr>
Date: Tue, 4 Oct 2011 17:20:52 +0000 (+0200)
Subject: Merge.
X-Git-Tag: v3.3.0a1~1328
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2b72f83877e1758676ca1ee157451466e7e2dad2;p=thirdparty%2FPython%2Fcpython.git

Merge.
---

2b72f83877e1758676ca1ee157451466e7e2dad2