From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 14 Apr 2014 16:16:07 +0000 (-0400)
Subject: merge 3.3
X-Git-Tag: v3.4.1rc1~92
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b814057cda86e42925095be1d005c737a09715a0;p=python

merge 3.3
---

b814057cda86e42925095be1d005c737a09715a0