From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 11 Mar 2014 18:59:48 +0000 (-0500)
Subject: merge 3.3 (closes #20892)
X-Git-Tag: v3.4.1rc1~233^2~57
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=162d7ca3cc62096a91bbb2fd591b90b7c4b5581b;p=python

merge 3.3 (closes #20892)
---

162d7ca3cc62096a91bbb2fd591b90b7c4b5581b