From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 14 Jan 2014 05:29:03 +0000 (-0500)
Subject: merge 3.3
X-Git-Tag: v3.4.0b3~152
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=60ea92883f87ff7eb18f6eacd354e86c28c8d910;p=python

merge 3.3
---

60ea92883f87ff7eb18f6eacd354e86c28c8d910