Recorded merge of revisions 85881,85897,85899 via svnmerge from

Recorded merge of revisions 85881,85897,85899 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r85881 | victor.stinner | 2010-10-28 13:20:31 +0200 (jeu., 28 oct. 2010) | 2 lines

  test_pep277: add identifiers to filenames
........
  r85897 | victor.stinner | 2010-10-29 00:57:03 +0200 (ven., 29 oct. 2010) | 5 lines

  test_pep277: disable filenames 11, 12, 13, 14 on darwin

  Because darwin "normalizes" these filenames differently than Python's NFD
  normalization.
........
  r85899 | victor.stinner | 2010-10-29 01:14:45 +0200 (ven., 29 oct. 2010) | 4 lines

  #10209, test_pep277: disable test_normalize and test_listdir on darwin

  These tests are irrevelant on this OS.
........