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

merge 3.3
---

fc2f64135861c7645ea21e3499e4d723bcd5d498