diff -r 831f49cc00fc Doc/library/smtplib.rst
--- a/Doc/library/smtplib.rst	Mon Jan 14 02:24:05 2013 +0100
+++ b/Doc/library/smtplib.rst	Mon Jan 14 10:04:04 2013 +0000
@@ -178,8 +178,9 @@
 
 .. method:: SMTP.set_debuglevel(level)
 
-   Set the debug output level.  A true value for *level* results in debug messages
-   for connection and for all messages sent to and received from the server.
+   Set the debug output level.  A value of 1 or ``True`` for *level* results in debug
+   messages for connection and for all messages sent to and received from the server.
+   A value of 2 for *level* results in these messages being timestamped.
 
 
 .. method:: SMTP.connect(host='localhost', port=0)
diff -r 831f49cc00fc Lib/smtplib.py
--- a/Lib/smtplib.py	Mon Jan 14 02:24:05 2013 +0100
+++ b/Lib/smtplib.py	Mon Jan 14 10:04:04 2013 +0000
@@ -50,6 +50,7 @@
 import base64
 import hmac
 import copy
+import datetime
 from email.base64mime import body_encode as encode_base64
 from sys import stderr
 
@@ -278,12 +279,19 @@
         """
         self.debuglevel = debuglevel
 
+    def _print_debug(self, message, *args):
+        if self.debuglevel > 1:
+            now = datetime.datetime.now().time()
+            message = '[{!s}] '.format(now) + message
+        for arg in args:
+            message += '{!s} '.format(arg)
+        print(message, file=stderr)
+
     def _get_socket(self, host, port, timeout):
         # This makes it simpler for SMTP_SSL to use the SMTP connect code
         # and just alter the socket connection bit.
         if self.debuglevel > 0:
-            print('connect: to', (host, port), self.source_address,
-                                 file=stderr)
+            self._print_debug('connect: to ', (host, port), self.source_address)
         return socket.create_connection((host, port), timeout,
                                         self.source_address)
 
@@ -313,18 +321,18 @@
         if not port:
             port = self.default_port
         if self.debuglevel > 0:
-            print('connect:', (host, port), file=stderr)
+            self._print_debug('connect: ', (host, port))
         self.sock = self._get_socket(host, port, self.timeout)
         self.file = None
         (code, msg) = self.getreply()
         if self.debuglevel > 0:
-            print("connect:", msg, file=stderr)
+            self._print_debug('connect: ', msg)
         return (code, msg)
 
     def send(self, s):
         """Send `s' to the server."""
         if self.debuglevel > 0:
-            print('send:', repr(s), file=stderr)
+            self._print_debug('send: ', repr(s))
         if hasattr(self, 'sock') and self.sock:
             if isinstance(s, str):
                 s = s.encode("ascii")
@@ -371,7 +379,7 @@
                 self.close()
                 raise SMTPServerDisconnected("Connection unexpectedly closed")
             if self.debuglevel > 0:
-                print('reply:', repr(line), file=stderr)
+                self._print_debug('reply: ', repr(line))
             resp.append(line[4:].strip(b' \t\r\n'))
             code = line[:3]
             # Check that the error code is syntactically correct.
@@ -387,8 +395,7 @@
 
         errmsg = b"\n".join(resp)
         if self.debuglevel > 0:
-            print('reply: retcode (%s); Msg: %s' % (errcode, errmsg),
-                                                    file=stderr)
+            self._print_debug('reply: retcode (%s); Msg: %s' % (errcode, errmsg))
         return errcode, errmsg
 
     def docmd(self, cmd, args=""):
@@ -505,7 +512,7 @@
         self.putcmd("data")
         (code, repl) = self.getreply()
         if self.debuglevel > 0:
-            print("data:", (code, repl), file=stderr)
+            self._print_debug('data: ', (code, repl))
         if code != 354:
             raise SMTPDataError(code, repl)
         else:
@@ -518,7 +525,7 @@
             self.send(q)
             (code, msg) = self.getreply()
             if self.debuglevel > 0:
-                print("data:", (code, msg), file=stderr)
+                self._print_debug('data: ', (code, msg))
             return (code, msg)
 
     def verify(self, address):
@@ -873,7 +880,7 @@
 
         def _get_socket(self, host, port, timeout):
             if self.debuglevel > 0:
-                print('connect:', (host, port), file=stderr)
+                self._print_debug('connect: ', (host, port))
             new_socket = socket.create_connection((host, port), timeout,
                     self.source_address)
             if self.context is not None:
@@ -922,14 +929,14 @@
             self.sock.connect(host)
         except OSError:
             if self.debuglevel > 0:
-                print('connect fail:', host, file=stderr)
+                self._print_debug('connect fail: ', host)
             if self.sock:
                 self.sock.close()
             self.sock = None
             raise
         (code, msg) = self.getreply()
         if self.debuglevel > 0:
-            print('connect:', msg, file=stderr)
+            self._print_debug('connect: ', msg)
         return (code, msg)
 
 
diff -r 831f49cc00fc Misc/ACKS
--- a/Misc/ACKS	Mon Jan 14 02:24:05 2013 +0100
+++ b/Misc/ACKS	Mon Jan 14 10:04:04 2013 +0000
@@ -201,6 +201,7 @@
 Brad Chapman
 Greg Chapman
 Mitch Chapman
+Gavin Chappell
 David Chaum
 Nicolas Chauvat
 Jerry Chen