From: Raymond Hettinger <python@rcn.com>
Date: Thu, 23 May 2013 07:15:19 +0000 (-0700)
Subject: merge
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8f34da3f5fa7942e69c0c02a5e6faf8bc3acba71;p=python

merge
---

8f34da3f5fa7942e69c0c02a5e6faf8bc3acba71