From: Raymond Hettinger <python@rcn.com>
Date: Sun, 29 Apr 2012 21:57:05 +0000 (-0700)
Subject: merge
X-Git-Tag: v3.3.0a3~28
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a6df2ee7d084f830f100a5bd563005389d7d20c4;p=python

merge
---

a6df2ee7d084f830f100a5bd563005389d7d20c4