diff -r a80b8ff63f85 Doc/library/functions.rst
--- a/Doc/library/functions.rst	Sat Apr 13 22:46:33 2013 +0200
+++ b/Doc/library/functions.rst	Sat Apr 13 17:12:13 2013 -0400
@@ -1235,7 +1235,8 @@
    It can be called either on the class (such as ``C.f()``) or on an instance (such
    as ``C().f()``).  The instance is ignored except for its class.
 
-   Static methods in Python are similar to those found in Java or C++. Also see
+   Static methods in Python are similar to those found in Java or C++, except
+   they are never implicitly included in a function's namespace. Also see
    :func:`classmethod` for a variant that is useful for creating alternate class
    constructors.
 
diff -r a80b8ff63f85 Lib/smtplib.py
--- a/Lib/smtplib.py	Sat Apr 13 22:46:33 2013 +0200
+++ b/Lib/smtplib.py	Sat Apr 13 17:12:13 2013 -0400
@@ -66,7 +66,7 @@
 OLDSTYLE_AUTH = re.compile(r"auth=(.*)", re.I)
 
 # Exception classes used by this module.
-class SMTPException(IOError):
+class SMTPException(OSError):
     """Base class for all exceptions raised by this module."""
 
 class SMTPServerDisconnected(SMTPException):