From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 28 Jan 2013 23:28:53 +0000 (-0500)
Subject: merge 3.3 (#4590)
X-Git-Tag: v3.4.0a1~1508
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=63c52027153ad0b36d7b6fa9ce0c45cfe94c05cb;p=python

merge 3.3 (#4590)
---

63c52027153ad0b36d7b6fa9ce0c45cfe94c05cb