From: Raymond Hettinger <python@rcn.com>
Date: Sat, 9 Mar 2013 07:04:47 +0000 (-0800)
Subject: merge
X-Git-Tag: v3.4.0a1~1243^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=36fe22806ce162300044a4d09e47ae166d2084ef;p=python

merge
---

36fe22806ce162300044a4d09e47ae166d2084ef