From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 16 Apr 2013 01:38:33 +0000 (-0400)
Subject: merge 3.3
X-Git-Tag: v3.4.0a1~909
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=48a2e7c357b7f2148ada9473c796351cc562284b;p=python

merge 3.3
---

48a2e7c357b7f2148ada9473c796351cc562284b