Blocked revisions 68780 via svnmerge

Blocked revisions 68780 via svnmerge

................
  r68780 | benjamin.peterson | 2009-01-19 11:53:36 -0600 (Mon, 19 Jan 2009) | 14 lines

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

  ........
    r68763 | kristjan.jonsson | 2009-01-19 07:10:27 -0600 (Mon, 19 Jan 2009) | 2 lines

    Issue 4957
    Let os.ftruncate raise OSError like documented.
  ........
    r68773 | benjamin.peterson | 2009-01-19 09:51:27 -0600 (Mon, 19 Jan 2009) | 1 line

    simplify code
  ........
................