From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 29 Sep 2013 18:59:19 +0000 (-0400)
Subject: merge 3.3
X-Git-Tag: v3.4.0a4~311^2~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=eea020f1ae07580129ca47eb731289f0b8c829dc;p=python

merge 3.3
---

eea020f1ae07580129ca47eb731289f0b8c829dc