From: Nick Coghlan <ncoghlan@gmail.com>
Date: Sun, 25 May 2014 15:00:34 +0000 (+1000)
Subject: Merge from 3.4
X-Git-Tag: v3.5.0a1~1600
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0afd0ad14316247b498d38a315a1c9765c1ad29e;p=thirdparty%2FPython%2Fcpython.git

Merge from 3.4
---

0afd0ad14316247b498d38a315a1c9765c1ad29e