From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Sun, 8 Jun 2014 18:49:07 +0000 (-0400)
Subject: Merge heads.
X-Git-Tag: v3.5.0a1~1491
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6d4f8f0fea6a60a02fe4d0e4b9fabb6549f1416a;p=python

Merge heads.
---

6d4f8f0fea6a60a02fe4d0e4b9fabb6549f1416a