From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 13 Apr 2012 15:59:52 +0000 (-0400)
Subject: merge 3.2
X-Git-Tag: v3.3.0a3~240
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=899ee613f7b4a4f5967943095d5fbc9522356ad3;p=python

merge 3.2
---

899ee613f7b4a4f5967943095d5fbc9522356ad3