From: Michael Foord <michael@python.org>
Date: Wed, 16 Mar 2011 21:28:51 +0000 (-0400)
Subject: merge 3.2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4b3181804227a5a4148fdf60b6655a989b45a8ff;p=python

merge 3.2
---

4b3181804227a5a4148fdf60b6655a989b45a8ff