From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 17 Jun 2014 06:16:31 +0000 (-0700)
Subject: merge 3.3
X-Git-Tag: v3.4.2rc1~371
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9db281662ded4e855cd8fbdfb8061efbbce282e3;p=python

merge 3.3
---

9db281662ded4e855cd8fbdfb8061efbbce282e3