From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 15 Jan 2013 21:49:35 +0000 (-0500)
Subject: merge 3.3 (#7340)
X-Git-Tag: v3.4.0a1~1597
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=184f01544fd35e990f3de5325567a9efe3b24217;p=python

merge 3.3 (#7340)
---

184f01544fd35e990f3de5325567a9efe3b24217