From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 21 Jul 2013 20:26:27 +0000 (-0700)
Subject: merge 3.3
X-Git-Tag: v3.4.0a1~115
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=33113a3504c8ae2567b18fe39d283f985f01defe;p=python

merge 3.3
---

33113a3504c8ae2567b18fe39d283f985f01defe