From: Guido van Rossum <guido@python.org>
Date: Tue, 29 Mar 2011 20:03:10 +0000 (-0700)
Subject: Merge cleanup.
X-Git-Tag: v2.6.7~8
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8c850bf8198d37cfb270cddb1aebbc00d1880797;p=python

Merge cleanup.
---

8c850bf8198d37cfb270cddb1aebbc00d1880797