From: Georg Brandl <georg@python.org> Date: Sat, 5 Mar 2011 14:13:50 +0000 (+0100) Subject: Dummy-merge 2.5 branch into 2.6 branch. X-Git-Tag: v2.6.7~19 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ae2af38f3d605c1e347ad4d1fd7e8bcb43435531;p=python Dummy-merge 2.5 branch into 2.6 branch. --- ae2af38f3d605c1e347ad4d1fd7e8bcb43435531