]> granicus.if.org Git - python/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Tue, 13 Mar 2012 21:13:21 +0000 (16:13 -0500)
committerBenjamin Peterson <benjamin@python.org>
Tue, 13 Mar 2012 21:13:21 +0000 (16:13 -0500)

Trivial merge