From: R David Murray <rdmurray@bitdance.com>
Date: Thu, 31 Mar 2011 15:48:31 +0000 (-0400)
Subject: Dummy merge from 2.6.
X-Git-Tag: v2.7.2rc1~189
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=824504dd7ef218148db0b3c841af18f56af48ba1;p=python

Dummy merge from 2.6.
---

824504dd7ef218148db0b3c841af18f56af48ba1