]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Issue #12408: Merge.
authorMark Dickinson <mdickinson@enthought.com>
Sat, 25 Jun 2011 11:29:49 +0000 (13:29 +0200)
committerMark Dickinson <mdickinson@enthought.com>
Sat, 25 Jun 2011 11:29:49 +0000 (13:29 +0200)

Trivial merge