From: Georg Brandl <georg@python.org>
Date: Sat, 5 Mar 2011 14:15:07 +0000 (+0100)
Subject: Dummy-merge 2.6 branch into 2.7 branch.
X-Git-Tag: v2.7.2rc1~287
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dadb9cbd5ae91af6a897c0f4c6d838f189f6df2c;p=python

Dummy-merge 2.6 branch into 2.7 branch.
---

dadb9cbd5ae91af6a897c0f4c6d838f189f6df2c