]> granicus.if.org Git - python/commitdiff
Merge from 3.2 (change already committed in py3k)
authorÉric Araujo <merwok@netwok.org>
Fri, 26 Aug 2011 14:39:26 +0000 (16:39 +0200)
committerÉric Araujo <merwok@netwok.org>
Fri, 26 Aug 2011 14:39:26 +0000 (16:39 +0200)

Trivial merge