From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 2 Feb 2014 20:31:07 +0000 (-0500)
Subject: merge 3.3 (#20102)
X-Git-Tag: v3.4.0rc1~120
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=85f107443814b250c1396969aa060ec3ec26d4db;p=python

merge 3.3 (#20102)
---

85f107443814b250c1396969aa060ec3ec26d4db