From: Raymond Hettinger <python@rcn.com>
Date: Sat, 19 Jan 2013 01:53:18 +0000 (-0800)
Subject: merge
X-Git-Tag: v3.4.0a1~1578
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8a7d74446c121db18bbec03aa86ce3ebd2483e50;p=python

merge
---

8a7d74446c121db18bbec03aa86ce3ebd2483e50