From: Charles-François Natali <cf.natali@gmail.com>
Date: Mon, 16 Dec 2013 12:49:30 +0000 (+0100)
Subject: Merge.
X-Git-Tag: v3.4.0b2~205^2~1^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=461836a5dd162a4be7eacf784ef4ea97430468da;p=thirdparty%2FPython%2Fcpython.git

Merge.
---

461836a5dd162a4be7eacf784ef4ea97430468da