]> granicus.if.org Git - python/commitdiff
merge heads
authorGeorg Brandl <georg@python.org>
Sun, 6 Mar 2011 09:36:06 +0000 (10:36 +0100)
committerGeorg Brandl <georg@python.org>
Sun, 6 Mar 2011 09:36:06 +0000 (10:36 +0100)

Trivial merge