]> granicus.if.org Git - python/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Mon, 2 Jan 2012 15:00:38 +0000 (09:00 -0600)
committerBenjamin Peterson <benjamin@python.org>
Mon, 2 Jan 2012 15:00:38 +0000 (09:00 -0600)

Trivial merge