From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 31 Mar 2014 17:46:26 +0000 (-0400)
Subject: merge 3.2
X-Git-Tag: v3.4.1rc1~150^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b25e3f9e6a1a8ea292335a23eb7dea9d8174efa1;p=python

merge 3.2
---

b25e3f9e6a1a8ea292335a23eb7dea9d8174efa1