Merged revisions 79403 via svnmerge from

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

........
  r79403 | benjamin.peterson | 2010-03-24 20:04:58 -0500 (Wed, 24 Mar 2010) | 1 line

  set eol on email example
........