From: Raymond Hettinger <python@rcn.com>
Date: Tue, 10 May 2011 07:36:35 +0000 (-0700)
Subject: merge
X-Git-Tag: v3.3.0a1~2324
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=809d116fa936f60026cb92010a2506c362adef14;p=python

merge
---

809d116fa936f60026cb92010a2506c362adef14