From: Barry Warsaw <barry@python.org>
Date: Sat, 4 Jun 2011 00:07:41 +0000 (-0400)
Subject: Null merge from 2.6.
X-Git-Tag: v2.7.3rc1~700
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7d214018119eeee43abc14db6385a2b684d1e4f8;p=python

Null merge from 2.6.
---

7d214018119eeee43abc14db6385a2b684d1e4f8