From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 17 May 2013 00:38:48 +0000 (-0500)
Subject: merge 3.3
X-Git-Tag: v3.4.0a1~709
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a07565da2067794b005030659b8af8c73679fbf5;p=python

merge 3.3
---

a07565da2067794b005030659b8af8c73679fbf5