From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 15 Jun 2014 01:40:10 +0000 (-0700)
Subject: merge 3.2 (#21766)
X-Git-Tag: v3.3.6rc1~16
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6cd1954c5cff4b3722a183d13648c71b18259778;p=python

merge 3.2 (#21766)
---

6cd1954c5cff4b3722a183d13648c71b18259778