From: Charles-François Natali <neologix@free.fr>
Date: Thu, 29 Sep 2011 17:51:46 +0000 (+0200)
Subject: Merge.
X-Git-Tag: v3.3.0a1~1437
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=734e159b1249dc2c36d4ff5923af2c06339cd7fa;p=thirdparty%2FPython%2Fcpython.git

Merge.
---

734e159b1249dc2c36d4ff5923af2c06339cd7fa