From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 16 Jul 2013 03:50:25 +0000 (-0700)
Subject: merge 3.3
X-Git-Tag: v3.4.0a1~194
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cb2226cb6902993ebe68d7c7748d42e0240958b9;p=python

merge 3.3
---

cb2226cb6902993ebe68d7c7748d42e0240958b9