]> granicus.if.org Git - python/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Tue, 24 Jan 2012 14:07:06 +0000 (09:07 -0500)
committerBenjamin Peterson <benjamin@python.org>
Tue, 24 Jan 2012 14:07:06 +0000 (09:07 -0500)

Trivial merge