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

merge 3.3
---

3c16c1d821f307bca3a72f34c1a7dc2b56cb8eff