commit | f5243f07f640f4ae847f2d56e86f5b48ed78728a | [log] [tgz] |
---|---|---|
author | Guido van Rossum <guido@python.org> | Tue Jan 01 04:06:48 2008 +0000 |
committer | Guido van Rossum <guido@python.org> | Tue Jan 01 04:06:48 2008 +0000 |
tree | 46d447127d885a6dc3f131d724e9e52e9b617506 | |
parent | a9de06d2c55499dc6975370ecd76342660d973a2 [diff] |
Merge changes from 59576 from trunk to p3yk branch; these were skipped in the regular merge. Fixes issue #1693.