]> granicus.if.org Git - python/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Tue, 8 Mar 2011 04:52:41 +0000 (22:52 -0600)
committerBenjamin Peterson <benjamin@python.org>
Tue, 8 Mar 2011 04:52:41 +0000 (22:52 -0600)

Trivial merge