From: Raymond Hettinger <python@rcn.com>
Date: Sun, 4 Aug 2013 19:43:59 +0000 (-0700)
Subject: merge
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=28dc9b9fc01f46401f1e085f9993ca4b429b154e;p=python

merge
---

28dc9b9fc01f46401f1e085f9993ca4b429b154e