From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 13 Oct 2014 15:55:02 +0000 (-0400)
Subject: merge 3.3
X-Git-Tag: v3.4.3rc1~480
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=157da6fdd27ba56ee298f24def28f8093d989580;p=thirdparty%2FPython%2Fcpython.git

merge 3.3
---

157da6fdd27ba56ee298f24def28f8093d989580