From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 15 Dec 2012 20:44:08 +0000 (-0500)
Subject: merge 3.2
X-Git-Tag: v3.3.1rc1~529
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=18d105b824ce55afacf18a9e2a8fee6ea62b2e54;p=python

merge 3.2
---

18d105b824ce55afacf18a9e2a8fee6ea62b2e54