Merged revisions 80620 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80620 | ezio.melotti | 2010-04-29 18:07:20 +0200 (Thu, 29 Apr 2010) | 1 line

  Group the Windows entries in getfilesystemencoding doc, move the win 9x one at the bottom of the list and fix some markup.
........