From: Barry Warsaw <barry@python.org>
Date: Mon, 20 Feb 2012 19:44:26 +0000 (-0500)
Subject: null merge from 2.6
X-Git-Tag: v2.7.3rc1~34^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b0516c2fe0feae6917f82e72f562ebd504cbfaf9;p=thirdparty%2FPython%2Fcpython.git

null merge from 2.6
---

b0516c2fe0feae6917f82e72f562ebd504cbfaf9