Merged revision 66295 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r66295 | gregory.p.smith | 2008-09-07 12:18:16 -0700 (Sun, 07 Sep 2008)

  bugfix to r66283 (see issue #1204).
........