From: Raymond Hettinger <python@rcn.com>
Date: Tue, 24 Apr 2012 04:26:58 +0000 (-0700)
Subject: merge
X-Git-Tag: v2.7.4rc1~889
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e65753e09e9b8a383b68b71f7e39d597b0c61b68;p=python

merge
---

e65753e09e9b8a383b68b71f7e39d597b0c61b68