From: Andrew Kuchling <amk@amk.ca>
Date: Sun, 15 Sep 2013 17:24:05 +0000 (-0400)
Subject: Null merge with 2.6
X-Git-Tag: v2.7.6rc1~151
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=35532c86f540983d6a2d476722bd0bfc8af35434;p=python

Null merge with 2.6
---

35532c86f540983d6a2d476722bd0bfc8af35434