From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 29 Apr 2013 13:08:33 +0000 (-0400)
Subject: merge 3.3
X-Git-Tag: v3.4.0a1~834
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5c089314efb94d3ab4ddfea9c27d408e97ec3ff2;p=python

merge 3.3
---

5c089314efb94d3ab4ddfea9c27d408e97ec3ff2