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

merge 3.2
---

eee50b07b1aa369c340ed3d64f201620c0e5f687