From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 31 Mar 2014 00:34:20 +0000 (-0400)
Subject: merge 3.3
X-Git-Tag: v3.4.1rc1~152
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f5bdfda2709ab5492ae0b306d5ff706777e6cdb5;p=python

merge 3.3
---

f5bdfda2709ab5492ae0b306d5ff706777e6cdb5