From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 15 Dec 2012 20:44:18 +0000 (-0500)
Subject: merge 3.3
X-Git-Tag: v3.4.0a1~1850
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6a020e8065f13737ff5f1380c132be097b4b02f9;p=python

merge 3.3
---

6a020e8065f13737ff5f1380c132be097b4b02f9