From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 16 Jan 2014 14:53:22 +0000 (-0500)
Subject: merge 3.3 (#20278)
X-Git-Tag: v3.4.0b3~132
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a65d121607d675eed3cc69cc5b0afdf07211003d;p=python

merge 3.3 (#20278)
---

a65d121607d675eed3cc69cc5b0afdf07211003d