From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 10 Jan 2013 20:16:42 +0000 (-0600)
Subject: merge 3.3 (#16900)
X-Git-Tag: v3.4.0a1~1656
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f86b3c394ce8edab17eac7d2d4ed107679ef6058;p=python

merge 3.3 (#16900)
---

f86b3c394ce8edab17eac7d2d4ed107679ef6058