From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 14 Apr 2014 16:15:58 +0000 (-0400)
Subject: merge 3.2
X-Git-Tag: v3.4.1rc1~92^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=98816bd234ec228ce70c9ccc47936cb28b2c6aac;p=thirdparty%2FPython%2Fcpython.git

merge 3.2
---

98816bd234ec228ce70c9ccc47936cb28b2c6aac