From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 4 Apr 2014 13:51:45 +0000 (-0400)
Subject: merge 3.2
X-Git-Tag: v3.4.1rc1~128^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7e90bc4433f8cdf49168d06db94b1f6b9795fa86;p=thirdparty%2FPython%2Fcpython.git

merge 3.2
---

7e90bc4433f8cdf49168d06db94b1f6b9795fa86