]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge with 3.2
authorNed Deily <nad@acm.org>
Fri, 7 Oct 2011 19:02:29 +0000 (12:02 -0700)
committerNed Deily <nad@acm.org>
Fri, 7 Oct 2011 19:02:29 +0000 (12:02 -0700)

Trivial merge