Merged revisions 87197-87198 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r87197 | antoine.pitrou | 2010-12-12 21:34:49 +0100 (dim., 12 déc. 2010) | 3 lines

  Homogenize the "optional OS services" menu
........
  r87198 | antoine.pitrou | 2010-12-12 21:57:12 +0100 (dim., 12 déc. 2010) | 3 lines

  Improve readability of the socket docs
........