From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Sat, 23 Aug 2014 22:20:00 +0000 (-0400)
Subject: Merge heads.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4426870275f0b12bc9b0d56de761505098dd172b;p=python

Merge heads.
---

4426870275f0b12bc9b0d56de761505098dd172b