From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 18 Jan 2013 05:10:37 +0000 (-0500)
Subject: merge 3.3
X-Git-Tag: v3.4.0a1~1582
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9f30abd3935704528f784d03f9a630a923c485e9;p=python

merge 3.3
---

9f30abd3935704528f784d03f9a630a923c485e9