From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 29 Nov 2012 15:56:11 +0000 (-0500)
Subject: merge 3.2 (#16573)
X-Git-Tag: v3.3.1rc1~580
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=139891ba82b37631d01c33397f0bbde7d0adcc1b;p=python

merge 3.2 (#16573)
---

139891ba82b37631d01c33397f0bbde7d0adcc1b