From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 22 Mar 2012 12:56:27 +0000 (-0400)
Subject: merge 3.2
X-Git-Tag: v3.3.0a2~91
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b304764ba2e4b34ae63644030b3ca8b6942fc0ae;p=python

merge 3.2
---

b304764ba2e4b34ae63644030b3ca8b6942fc0ae