]> granicus.if.org Git - python/commitdiff
merge 3.1
authorBenjamin Peterson <benjamin@python.org>
Sat, 12 Mar 2011 17:58:40 +0000 (11:58 -0600)
committerBenjamin Peterson <benjamin@python.org>
Sat, 12 Mar 2011 17:58:40 +0000 (11:58 -0600)

Trivial merge