]> granicus.if.org Git - python/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Sun, 1 Jan 2012 04:42:45 +0000 (22:42 -0600)
committerBenjamin Peterson <benjamin@python.org>
Sun, 1 Jan 2012 04:42:45 +0000 (22:42 -0600)

Trivial merge