From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 13 Jan 2013 02:22:33 +0000 (-0500)
Subject: merge 3.3
X-Git-Tag: v3.4.0a1~1621
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fa3965ab767bc85375634561cf9e4acf22eba5f2;p=python

merge 3.3
---

fa3965ab767bc85375634561cf9e4acf22eba5f2