]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge from 3.2
authorKurt B. Kaiser <kbk@shore.net>
Sat, 26 Mar 2011 00:34:11 +0000 (20:34 -0400)
committerKurt B. Kaiser <kbk@shore.net>
Sat, 26 Mar 2011 00:34:11 +0000 (20:34 -0400)

Trivial merge