From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 20 May 2013 02:39:46 +0000 (-0700)
Subject: merge 3.3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d2cef8a2048954adef759a9eb01e06b1cb616bf5;p=python

merge 3.3
---

d2cef8a2048954adef759a9eb01e06b1cb616bf5