]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge with 3.2
authorSandro Tosi <sandro.tosi@gmail.com>
Sat, 7 Jan 2012 17:34:24 +0000 (18:34 +0100)
committerSandro Tosi <sandro.tosi@gmail.com>
Sat, 7 Jan 2012 17:34:24 +0000 (18:34 +0100)

Trivial merge