From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Sat, 23 Aug 2014 22:24:09 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.5.0a1~1020
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=763826aec1a8ed250069e28bdf812110bcb763d8;p=python

Merge with 3.4
---

763826aec1a8ed250069e28bdf812110bcb763d8