From: Brian Curtin <brian@python.org>
Date: Tue, 15 May 2012 00:43:16 +0000 (-0500)
Subject: Merge 3.2
X-Git-Tag: v3.3.0a4~167
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a79e7fed48e0f2f083948d99662135cfb22aab36;p=python

Merge 3.2
---

a79e7fed48e0f2f083948d99662135cfb22aab36