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

null merge from 2.6
---

f364b15985a668716b76670e8f3cb5c3680fd3b0