From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 19 Jan 2013 19:58:51 +0000 (-0500)
Subject: merge 3.3
X-Git-Tag: v3.4.0a1~1573
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f0472f6995d71350834a097762ee2eba4b0b13f8;p=python

merge 3.3
---

f0472f6995d71350834a097762ee2eba4b0b13f8