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

Merge.
---

808d83d8fdde6bd5d3a0da2302826c69e40fba61