From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 12 Oct 2012 16:05:09 +0000 (-0400)
Subject: merge 3.3
X-Git-Tag: v3.4.0a1~2263
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=460498085467718f3a7c084638638711c2c3b4b4;p=python

merge 3.3
---

460498085467718f3a7c084638638711c2c3b4b4