From: Barry Warsaw <barry@python.org>
Date: Wed, 20 Feb 2013 23:25:17 +0000 (-0500)
Subject: null merge from 2.6
X-Git-Tag: v2.7.4rc1~96
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=01a97f3612805bf4575dd1f53a3ccf322de2946a;p=python

null merge from 2.6
---

01a97f3612805bf4575dd1f53a3ccf322de2946a