]> granicus.if.org Git - python/commitdiff
merge from release branch
authorBenjamin Peterson <benjamin@python.org>
Tue, 20 Mar 2012 14:40:55 +0000 (10:40 -0400)
committerBenjamin Peterson <benjamin@python.org>
Tue, 20 Mar 2012 14:40:55 +0000 (10:40 -0400)

Trivial merge