From: Charles-François Natali <neologix@free.fr>
Date: Sat, 14 Jan 2012 10:53:37 +0000 (+0100)
Subject: Merge.
X-Git-Tag: v3.3.0a1~412^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=512d54fea25804f133032579247a3e66309934e4;p=thirdparty%2FPython%2Fcpython.git

Merge.
---

512d54fea25804f133032579247a3e66309934e4