From: Kristján Valur Jónsson <sweskman@gmail.com>
Date: Thu, 8 May 2014 11:18:27 +0000 (+0000)
Subject: Merge with 3.4
X-Git-Tag: v3.5.0a1~1719
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f3d90fb46b29613749921be3f8797e973ae3f627;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.4
---

f3d90fb46b29613749921be3f8797e973ae3f627