--- a/CHANGES.txt	Thu Apr 08 00:43:23 2004 +0000
+++ b/CHANGES.txt	Fri Apr 09 01:31:16 2004 +0000
@@ -136,6 +136,12 @@
     class
 
 
+2004-??-?? 0.6.9
+Fixed:
+- paging in classhelp popup was broken
+- socket timeout error logging can fail
+
+
 2004-04-01 0.6.8
 Fixed:
 - existing trackers (ie. live ones) may be used as templates for new

--- a/roundup/scripts/roundup_server.py	Thu Apr 08 00:43:23 2004 +0000
+++ b/roundup/scripts/roundup_server.py	Fri Apr 09 01:31:16 2004 +0000
@@ -17,7 +17,7 @@
 
 """Command-line script that runs a server over roundup.cgi.client.
 
-$Id: roundup_server.py,v 1.44 2004-04-07 01:12:26 richard Exp $
+$Id: roundup_server.py,v 1.45 2004-04-09 01:31:16 richard Exp $
 """
 __docformat__ = 'restructuredtext'
 
@@ -99,10 +99,7 @@
         except:
             exc, val, tb = sys.exc_info()
             if hasattr(socket, 'timeout') and isinstance(val, socket.timeout):
-                # we can't send socket timeout errors back to the client, duh
-                s = StringIO.StringIO()
-                traceback.print_exc(None, s)
-                self.log_message(str(s.getvalue()))
+                self.log_error('timeout')
             else:
                 # it'd be nice to be able to detect if these are going to have
                 # any effect...