From: Barry Warsaw <barry@python.org>
Date: Thu, 23 Feb 2012 16:03:31 +0000 (-0500)
Subject: null merge from 2.6
X-Git-Tag: v2.7.4rc1~1026
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=62cc44db0c70c3b487655f8940d2d07a0ac01ee6;p=thirdparty%2FPython%2Fcpython.git

null merge from 2.6
---

62cc44db0c70c3b487655f8940d2d07a0ac01ee6