From: Georg Brandl <georg@python.org>
Date: Mon, 6 Oct 2014 14:57:02 +0000 (+0200)
Subject: merge with 3.4
X-Git-Tag: v3.5.0a1~740
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1f6afef2eafa9c7ab7293892d65259f48c35bfd8;p=thirdparty%2FPython%2Fcpython.git

merge with 3.4
---

1f6afef2eafa9c7ab7293892d65259f48c35bfd8