From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Tue, 20 May 2014 02:54:58 +0000 (-0400)
Subject: merge heads
X-Git-Tag: v3.4.2rc1~521
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b7b56e9110171fb4430d3711c4054d1425d5bc1c;p=python

merge heads
---

b7b56e9110171fb4430d3711c4054d1425d5bc1c