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

Merge.
---

f25f80c8391b49779188fde6f8863bc2948ab101