]> granicus.if.org Git - python/commitdiff
dummy merge from 3.2
authorEli Bendersky <eliben@gmail.com>
Fri, 11 Mar 2011 14:42:13 +0000 (16:42 +0200)
committerEli Bendersky <eliben@gmail.com>
Fri, 11 Mar 2011 14:42:13 +0000 (16:42 +0200)

Trivial merge