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

Merge heads.
---

0d3e4b4e1a2ea149d987efe1179ef16c7760101d