From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 11 Mar 2014 19:26:21 +0000 (-0500)
Subject: merge 3.3
X-Git-Tag: v3.4.1rc1~233^2~55
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=86deec19170fe6d0e4e454b2ddab9c2e7cd2869d;p=python

merge 3.3
---

86deec19170fe6d0e4e454b2ddab9c2e7cd2869d