]> granicus.if.org Git - python/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Tue, 12 Apr 2011 23:34:06 +0000 (18:34 -0500)
committerBenjamin Peterson <benjamin@python.org>
Tue, 12 Apr 2011 23:34:06 +0000 (18:34 -0500)

Trivial merge