From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 19 Oct 2014 14:47:58 +0000 (-0400)
Subject: merge 3.3
X-Git-Tag: v3.4.3rc1~446
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0fc08fd2c7774a5521ae198b04639ec634fdb5c2;p=thirdparty%2FPython%2Fcpython.git

merge 3.3
---

0fc08fd2c7774a5521ae198b04639ec634fdb5c2