From: Raymond Hettinger <python@rcn.com>
Date: Fri, 22 Mar 2013 14:26:57 +0000 (-0700)
Subject: merge
X-Git-Tag: v3.4.0a1~1114
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=671ddbe5a0afcd32203a334372f9db5f0ac076ba;p=python

merge
---

671ddbe5a0afcd32203a334372f9db5f0ac076ba