Recorded merge of revisions 80846 via svnmerge from

Recorded merge of revisions 80846 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r80846 | victor.stinner | 2010-05-06 02:08:46 +0200 (jeu., 06 mai 2010) | 20 lines

  Recorded merge of revisions 80844-80845 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r80844 | victor.stinner | 2010-05-06 01:33:33 +0200 (jeu., 06 mai 2010) | 5 lines

    Untabify Modules/posixmodule.c

    Run Antoine Pitrou "untabify" script + manual editions (OS/2 and some
    continuation lines).
  ........
    r80845 | victor.stinner | 2010-05-06 02:03:44 +0200 (jeu., 06 mai 2010) | 4 lines

    Untabify Modules/posixmodule.c (2)

    Fix some more functions by hand
  ........

  I rewrote the patch for py3k from scratch using untabify + manual editions
................