Merge email package 4.0 from the sandbox, including documentation, test cases,
and NEWS updates.
diff --git a/Doc/lib/email-simple.py b/Doc/lib/email-simple.py
index a445f1b..44152a4 100644
--- a/Doc/lib/email-simple.py
+++ b/Doc/lib/email-simple.py
@@ -2,7 +2,7 @@
import smtplib
# Import the email modules we'll need
-from email.MIMEText import MIMEText
+from email.mime.text import MIMEText
# Open a plain text file for reading. For this example, assume that
# the text file contains only ASCII characters.