From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 12 Oct 2013 19:55:33 +0000 (-0400)
Subject: merge 3.3
X-Git-Tag: v3.4.0a4~156^2~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4c6ed25b9621c58d081f06660ca7f970836ec3c6;p=python

merge 3.3
---

4c6ed25b9621c58d081f06660ca7f970836ec3c6