From: Charles-François Natali <cf.natali@gmail.com>
Date: Thu, 29 Aug 2013 17:26:12 +0000 (+0200)
Subject: Merge.
X-Git-Tag: v2.7.6rc1~187
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b2fa280e9e1da3724a81f47a4659cc3526d95a96;p=thirdparty%2FPython%2Fcpython.git

Merge.
---

b2fa280e9e1da3724a81f47a4659cc3526d95a96