From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 16 Jan 2014 15:10:26 +0000 (-0500)
Subject: merge 3.3 (#20272)
X-Git-Tag: v3.4.0b3~131
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5cacb84d836bd1f618702adaf0c6e704268f677d;p=python

merge 3.3 (#20272)
---

5cacb84d836bd1f618702adaf0c6e704268f677d