From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Mon, 27 Jan 2014 01:12:18 +0000 (-0500)
Subject: Merge heads.
X-Git-Tag: v3.4.0rc1~224^2~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a4b6b5311482087afb2f0b1c0277878d19b75368;p=python

Merge heads.
---

a4b6b5311482087afb2f0b1c0277878d19b75368