]> granicus.if.org Git - python/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Mon, 26 Mar 2012 02:41:06 +0000 (22:41 -0400)
committerBenjamin Peterson <benjamin@python.org>
Mon, 26 Mar 2012 02:41:06 +0000 (22:41 -0400)

Trivial merge