From: Charles-François Natali <cf.natali@gmail.com>
Date: Sat, 7 Dec 2013 19:28:46 +0000 (+0100)
Subject: Merge.
X-Git-Tag: v3.4.0b2~308
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7d096c258106a1e53b544b533d8b9e34538650cd;p=thirdparty%2FPython%2Fcpython.git

Merge.
---

7d096c258106a1e53b544b533d8b9e34538650cd