From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Mon, 28 May 2012 01:54:28 +0000 (-0400)
Subject: merge heads
X-Git-Tag: v3.3.0a4~38
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d0a0e8e070f1c3c74905627380473f21f5457cfb;p=python

merge heads
---

d0a0e8e070f1c3c74905627380473f21f5457cfb