From: Charles-François Natali <cf.natali@gmail.com>
Date: Sun, 25 Aug 2013 16:27:59 +0000 (+0200)
Subject: Merge.
X-Git-Tag: v3.4.0a2~117^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c20a7b977e919f1c261e955d3013ffae9ed0702f;p=thirdparty%2FPython%2Fcpython.git

Merge.
---

c20a7b977e919f1c261e955d3013ffae9ed0702f