From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 23 Apr 2012 15:25:49 +0000 (-0400)
Subject: merge 3.2
X-Git-Tag: v3.3.0a3~108
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=99e6f87586cd11d0d881891851c831a8d7ebb902;p=python

merge 3.2
---

99e6f87586cd11d0d881891851c831a8d7ebb902