From: Barry Warsaw <barry@python.org>
Date: Tue, 20 Sep 2011 18:58:19 +0000 (-0400)
Subject: Head merge
X-Git-Tag: v3.3.0a1~1517
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8ed6fa1c0ba2a6fdf6de38b1e60c71e28e4d4699;p=python

Head merge
---

8ed6fa1c0ba2a6fdf6de38b1e60c71e28e4d4699