From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Sat, 23 Aug 2014 22:23:50 +0000 (-0400)
Subject: Merge heads.
X-Git-Tag: v3.5.0a1~1021
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=133250c5b24266f65e7cd6c0bf1807efbe62bc02;p=python

Merge heads.
---

133250c5b24266f65e7cd6c0bf1807efbe62bc02