From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 2 Jan 2014 22:48:24 +0000 (-0600)
Subject: merge 3.3 (#20110)
X-Git-Tag: v3.4.0b2~44
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8ec15f7a924ad65e2fbda7bbb86f90c56ea633ea;p=python

merge 3.3 (#20110)
---

8ec15f7a924ad65e2fbda7bbb86f90c56ea633ea