diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 2ee27d908597..61c3881ffa54 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2006-12-01  Paolo Carlini  <pcarlini@suse.de>
+
+	* include/bits/stl_tree.h (_Rb_tree<>::destroy_node): Uglify.
+	(_M_erase, erase(iterator), erase(const_iterator)): Adjust.
+
 2006-11-29  Benjamin Kosnik  <bkoz@redhat.com>
 
 	* include/ext/throw_allocator.h: Consistent @file markup.
diff --git a/libstdc++-v3/include/bits/stl_tree.h b/libstdc++-v3/include/bits/stl_tree.h
index 96b7a52b9d3a..22e132fd927e 100644
--- a/libstdc++-v3/include/bits/stl_tree.h
+++ b/libstdc++-v3/include/bits/stl_tree.h
@@ -395,7 +395,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
       }
 
       void
-      destroy_node(_Link_type __p)
+      _M_destroy_node(_Link_type __p)
       {
 	get_allocator().destroy(&__p->_M_value_field);
 	_M_put_node(__p);
@@ -1245,7 +1245,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
 	static_cast<_Link_type>(_Rb_tree_rebalance_for_erase
 				(__position._M_node,
 				 this->_M_impl._M_header));
-      destroy_node(__y);
+      _M_destroy_node(__y);
       --_M_impl._M_node_count;
     }
 
@@ -1259,7 +1259,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
 	static_cast<_Link_type>(_Rb_tree_rebalance_for_erase
 				(const_cast<_Base_ptr>(__position._M_node),
 				 this->_M_impl._M_header));
-      destroy_node(__y);
+      _M_destroy_node(__y);
       --_M_impl._M_node_count;
     }
 
@@ -1322,7 +1322,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
 	{
 	  _M_erase(_S_right(__x));
 	  _Link_type __y = _S_left(__x);
-	  destroy_node(__x);
+	  _M_destroy_node(__x);
 	  __x = __y;
 	}
     }