From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Thu, 5 Jun 2014 01:02:48 +0000 (-0400)
Subject: Merge heads.
X-Git-Tag: v3.5.0a1~1518
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=be856e9a2132e1fab89b7e1fa60ce97e155189c8;p=python

Merge heads.
---

be856e9a2132e1fab89b7e1fa60ce97e155189c8