From: Barry Warsaw <barry@python.org>
Date: Wed, 22 Feb 2012 22:27:47 +0000 (-0500)
Subject: null merge from 2.6
X-Git-Tag: v2.7.3rc1~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a13294e209bbe9c689868db0100ebfc1bcc55364;p=thirdparty%2FPython%2Fcpython.git

null merge from 2.6
---

a13294e209bbe9c689868db0100ebfc1bcc55364