From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Wed, 27 Aug 2014 05:58:57 +0000 (-0400)
Subject: Merge with 3.4
X-Git-Tag: v3.5.0a1~1003
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=86cc17e69ebc002318d62501e914dc9bb394e503;p=python

Merge with 3.4
---

86cc17e69ebc002318d62501e914dc9bb394e503