]> granicus.if.org Git - python/commitdiff
Dummy-merge 2.5 branch into 2.6 branch.
authorGeorg Brandl <georg@python.org>
Sat, 5 Mar 2011 14:13:50 +0000 (15:13 +0100)
committerGeorg Brandl <georg@python.org>
Sat, 5 Mar 2011 14:13:50 +0000 (15:13 +0100)

Trivial merge