From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Fri, 16 May 2014 00:50:30 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.5.0a1~1644
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b96ebd4f9d89198dc6a7d0d446a0b8762ff2568b;p=python

Merge with 3.4
---

b96ebd4f9d89198dc6a7d0d446a0b8762ff2568b