From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 22 May 2013 20:27:32 +0000 (-0700)
Subject: merge 3.3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=965efe9e5efdeb53e10f181eb3d872e8f402a9fe;p=python

merge 3.3
---

965efe9e5efdeb53e10f181eb3d872e8f402a9fe