From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Mon, 16 Jun 2014 06:40:39 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.5.0a1~1443^2~38
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9bec397df9ef8c227e42760a749905cae0e94ebf;p=python

Merge with 3.4
---

9bec397df9ef8c227e42760a749905cae0e94ebf