From: Raymond Hettinger <python@rcn.com>
Date: Wed, 13 Apr 2011 01:58:40 +0000 (-0700)
Subject: Merge
X-Git-Tag: v3.3.0a1~2601
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ec78bc8e0594a0c394c227a4698c43c176a645a6;p=python

Merge
---

ec78bc8e0594a0c394c227a4698c43c176a645a6