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

Trivial merge