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
........