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

Merge with 3.4
---

e84d26c61b826792f62d49cda64f1f8c76dcf55c