From: Charles-François Natali <neologix@free.fr>
Date: Thu, 2 Feb 2012 19:36:47 +0000 (+0100)
Subject: Merge.
X-Git-Tag: v2.7.3rc1~99
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6dce7d633fdb33f0241cf7105b7b84537c9069a8;p=thirdparty%2FPython%2Fcpython.git

Merge.
---

6dce7d633fdb33f0241cf7105b7b84537c9069a8