From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 25 Jan 2014 05:00:28 +0000 (-0500)
Subject: merge 3.3
X-Git-Tag: v3.4.0b3~33
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e4e7199c50ffa6a513a1838f769137837f2e3883;p=python

merge 3.3
---

e4e7199c50ffa6a513a1838f769137837f2e3883