Merged revisions 68977,68981 via svnmerge from

Merged revisions 68977,68981 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r68977 | antoine.pitrou | 2009-01-26 22:48:00 +0100 (lun., 26 janv. 2009) | 3 lines

  Followup of #4705: we can't skip the binary buffering layer for stdin because FileIO doesn't have a read1() method
........
  r68981 | antoine.pitrou | 2009-01-26 23:00:21 +0100 (lun., 26 janv. 2009) | 3 lines

  Fix test so as to also pass in debug mode
........