From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 15 Mar 2014 17:29:21 +0000 (-0500)
Subject: merge 3.3
X-Git-Tag: v3.4.1rc1~233^2~10
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8a553f5be493f0b75cec3421069db0f008600bc5;p=python

merge 3.3
---

8a553f5be493f0b75cec3421069db0f008600bc5