]> granicus.if.org Git - python/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Thu, 29 Dec 2011 18:04:28 +0000 (12:04 -0600)
committerBenjamin Peterson <benjamin@python.org>
Thu, 29 Dec 2011 18:04:28 +0000 (12:04 -0600)

Trivial merge