From: Raymond Hettinger <python@rcn.com>
Date: Thu, 10 Oct 2013 05:43:30 +0000 (-0700)
Subject: merge
X-Git-Tag: v3.4.0a4~193
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5ed3bc9adbb5af56450b918410bf07b2bf54ef54;p=python

merge
---

5ed3bc9adbb5af56450b918410bf07b2bf54ef54