--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2009-12-14  Jaroslav Hajek  <highegg@gmail.com>
+
+	* symtab.cc (symbol_table::cleanup): New static method.
+	* symtab.h: Declare it.
+	* toplev.cc (clean_up_and_exit): Call it here.
+
 2009-12-12  Shai Ayal  <shaiay@users.sourceforge.net>
 
 	* DLD-FUNCTIONS/fltk_backend.cc (plot_window::toggle_grid,

--- a/src/symtab.cc
+++ b/src/symtab.cc
@@ -1331,6 +1331,39 @@
     }
 }
 
+void symbol_table::cleanup (void)
+{
+  // Clear variables in top scope.
+  all_instances[xtop_scope]->clear_all ();
+
+  // Clear function table. This is a hard clear, ignoring mlocked functions.
+  fcn_table.clear ();
+
+  // Clear variables in global scope.
+  // FIXME: are there any?
+  all_instances[xglobal_scope]->clear_all ();
+
+  // Clear global variables.
+  global_table.clear ();
+
+  // Delete all possibly remaining scopes. 
+  for (all_instances_iterator iter = all_instances.begin (); 
+       iter != all_instances.end (); iter++)
+    {
+      scope_id scope = iter->first;
+      if (scope != xglobal_scope && scope != xtop_scope)
+        scope_id_cache::free (scope);
+
+      // First zero the table entry to avoid possible duplicate delete.
+      symbol_table *inst = iter->second;
+      iter->second = 0;
+
+      // Now delete the scope. Note that there may be side effects, such as
+      // deleting other scopes.
+      delete inst;
+    }
+}
+
 DEFUN (ignore_function_time_stamp, args, nargout,
     "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {@var{val} =} ignore_function_time_stamp ()\n\

--- a/src/symtab.h
+++ b/src/symtab.h
@@ -1828,6 +1828,8 @@
       inst->curr_fcn = curr_fcn;
     }
 
+  static void cleanup (void);
+
 private:
 
   typedef std::map<std::string, symbol_record>::const_iterator table_const_iterator;

--- a/src/toplev.cc
+++ b/src/toplev.cc
@@ -673,6 +673,9 @@
 {
   do_octave_atexit ();
 
+  // Clean up symbol table.
+  SAFE_CALL (symbol_table::cleanup, ());
+
   SAFE_CALL (sysdep_cleanup, ())
 
   if (octave_exit)