Merged revisions 80840 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r80840 | tarek.ziade | 2010-05-06 00:43:04 +0200 (Thu, 06 May 2010) | 9 lines

  Merged revisions 80837 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r80837 | tarek.ziade | 2010-05-06 00:41:25 +0200 (Thu, 06 May 2010) | 1 line

    removed non needed lines
  ........
................