From: Barry Warsaw <barry@python.org>
Date: Mon, 23 May 2011 19:29:24 +0000 (-0400)
Subject: Null merge from 2.6 branch.
X-Git-Tag: v2.7.2rc1~20
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4ef33dc381607937ac9e0a5984a1ec22f238c6ed;p=python

Null merge from 2.6 branch.
---

4ef33dc381607937ac9e0a5984a1ec22f238c6ed