From: Charles-François Natali <neologix@free.fr>
Date: Fri, 3 Jun 2011 10:57:49 +0000 (+0200)
Subject: Merge.
X-Git-Tag: v3.3.0a1~2183^2~10
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3ca4db881fe8c3d62bbb7a573270fa3c25d9894b;p=thirdparty%2FPython%2Fcpython.git

Merge.
---

3ca4db881fe8c3d62bbb7a573270fa3c25d9894b