From: Raymond Hettinger <python@rcn.com>
Date: Tue, 19 Apr 2011 17:23:04 +0000 (-0700)
Subject: merge
X-Git-Tag: v3.2.1b1~102^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=35b873a7b2b25bf90099b1d449a35d6ff695d02b;p=python

merge
---

35b873a7b2b25bf90099b1d449a35d6ff695d02b