From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 2 Dec 2012 15:53:48 +0000 (-0500)
Subject: merge 3.3
X-Git-Tag: v3.4.0a1~1917
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3d490d4eff6980ab1577db5567d0ab457aa0c501;p=python

merge 3.3
---

3d490d4eff6980ab1577db5567d0ab457aa0c501