From: Raymond Hettinger <python@rcn.com>
Date: Mon, 18 Apr 2011 02:49:58 +0000 (-0700)
Subject: merge
X-Git-Tag: v3.3.0a1~2567
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a71c44bd2c44ca6a93aa56867ae00830066ef6b6;p=python

merge
---

a71c44bd2c44ca6a93aa56867ae00830066ef6b6