From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 9 Oct 2012 15:16:13 +0000 (-0400)
Subject: merge 3.3
X-Git-Tag: v3.4.0a1~2290
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=29e02a2be8d5e3e0e9967c5806b15965201bb7aa;p=python

merge 3.3
---

29e02a2be8d5e3e0e9967c5806b15965201bb7aa