From: Raymond Hettinger <python@rcn.com>
Date: Mon, 23 Apr 2012 07:22:48 +0000 (-0700)
Subject: merge
X-Git-Tag: v2.7.4rc1~892
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=016878aea6fb1904b8a04c7f56223c90cd8a0522;p=python

merge
---

016878aea6fb1904b8a04c7f56223c90cd8a0522