From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 21 Dec 2012 02:25:00 +0000 (-0600)
Subject: merge 3.3 (closes #16687)
X-Git-Tag: v3.4.0a1~1807
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=301162b43d13db686a1da09fbdcbe7875941be93;p=python

merge 3.3 (closes #16687)
---

301162b43d13db686a1da09fbdcbe7875941be93