Merged revisions 78657 via svnmerge from

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

................
  r78657 | r.david.murray | 2010-03-04 12:38:18 -0500 (Thu, 04 Mar 2010) | 10 lines

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

  ........
    r78656 | r.david.murray | 2010-03-04 12:34:05 -0500 (Thu, 04 Mar 2010) | 3 lines

    Fix documentation of email.Message.get_filename to match
    the fix applied in Issue 7082.
  ........
................