From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Sat, 9 Mar 2013 07:22:03 +0000 (-0500)
Subject: Merge heads
X-Git-Tag: v3.4.0a1~1243
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b4f998a57fd964085ccc024c88cf73f8323feb40;p=python

Merge heads
---

b4f998a57fd964085ccc024c88cf73f8323feb40