From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Sat, 10 Aug 2013 22:40:04 +0000 (-0400)
Subject: Merge
X-Git-Tag: v3.4.0a2~251
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e1acf347a59cf9948c0d7a3282786cdfe3cd1597;p=python

Merge
---

e1acf347a59cf9948c0d7a3282786cdfe3cd1597