From: Barry Warsaw <barry@python.org>
Date: Tue, 21 Feb 2012 16:16:52 +0000 (-0500)
Subject: merge 2.6
X-Git-Tag: v2.7.3rc1~15^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f7254bd2aa78622c85be3945b59490773cbb1b3e;p=python

merge 2.6
---

f7254bd2aa78622c85be3945b59490773cbb1b3e