From: Barry Warsaw <barry@python.org>
Date: Fri, 22 Nov 2013 16:08:25 +0000 (-0500)
Subject: Trunk merge.
X-Git-Tag: v3.4.0b1~121
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9e6097ebe7bb99a4a22b949ef4b1563b21ad7166;p=python

Trunk merge.
---

9e6097ebe7bb99a4a22b949ef4b1563b21ad7166