]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge heads
authorSandro Tosi <sandro.tosi@gmail.com>
Tue, 16 Aug 2011 18:08:04 +0000 (20:08 +0200)
committerSandro Tosi <sandro.tosi@gmail.com>
Tue, 16 Aug 2011 18:08:04 +0000 (20:08 +0200)

Trivial merge