From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 27 Sep 2013 13:11:31 +0000 (-0400)
Subject: merge 3.3
X-Git-Tag: v3.4.0a3~13
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c3034b14ffb335f8bc1a2bfb5cb913eef6ee75d8;p=python

merge 3.3
---

c3034b14ffb335f8bc1a2bfb5cb913eef6ee75d8