From: Charles-François Natali <cf.natali@gmail.com>
Date: Sun, 8 Sep 2013 10:35:53 +0000 (+0200)
Subject: Merge.
X-Git-Tag: v3.4.0a3~27^2~7
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6f6f4865d138f2348889ccc08aa8b18ca0263e48;p=thirdparty%2FPython%2Fcpython.git

Merge.
---

6f6f4865d138f2348889ccc08aa8b18ca0263e48