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

Merge.
---

b0042000c44bd19d0bdd8e84541cd8dc5c725d95