From: Barry Warsaw <barry@python.org>
Date: Tue, 19 Jul 2011 23:27:21 +0000 (-0400)
Subject: Upstream merge.
X-Git-Tag: v3.3.0a1~1871
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=49e175a572155ae2b9b14a2b9c7c57842a23d3b8;p=python

Upstream merge.
---

49e175a572155ae2b9b14a2b9c7c57842a23d3b8