From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 21 Sep 2012 03:49:33 +0000 (-0400)
Subject: merge 3.2
X-Git-Tag: v3.3.1rc1~818^2^2~62
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=61cdcf5d7ee2b00b62263ca5bb077e1b29a10bee;p=python

merge 3.2
---

61cdcf5d7ee2b00b62263ca5bb077e1b29a10bee