From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 2 Dec 2012 17:37:09 +0000 (-0500)
Subject: merge 3.3
X-Git-Tag: v3.4.0a1~1914
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=661c346ab34830c607a2bac92d21e25f47c3288d;p=python

merge 3.3
---

661c346ab34830c607a2bac92d21e25f47c3288d