From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 9 Jan 2013 15:52:22 +0000 (-0600)
Subject: merge 3.3 (#16906)
X-Git-Tag: v3.4.0a1~1671
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0b32a480bd0ddd25d0a2f511861c160590296ce2;p=python

merge 3.3 (#16906)
---

0b32a480bd0ddd25d0a2f511861c160590296ce2