From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Wed, 30 Jul 2014 23:24:47 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.5.0a1~1155
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7c87fdd5d5fd5d90ef5fd65237cef8287d42f3ff;p=python

Merge with 3.4
---

7c87fdd5d5fd5d90ef5fd65237cef8287d42f3ff