Merged revisions 80897 via svnmerge from

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

................
  r80897 | benjamin.peterson | 2010-05-06 18:03:05 -0500 (Thu, 06 May 2010) | 13 lines

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

  ........
    r80894 | benjamin.peterson | 2010-05-06 17:33:46 -0500 (Thu, 06 May 2010) | 1 line

    Availability gets its own line
  ........
    r80896 | benjamin.peterson | 2010-05-06 17:49:28 -0500 (Thu, 06 May 2010) | 1 line

    ensure that availability information is on its own line at the end of the function docs
  ........
................

git-svn-id: http://svn.python.org/projects/python/branches/release31-maint@80899 6015fed2-1504-0410-9fe1-9d1591cc4771