diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index e460524d7eb..c259322f74e 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,7 @@
+2007-05-13  Paolo Carlini  <pcarlini@suse.de>
+
+	* include/bits/stl_tempbuf.h (return_temporary_buffer(_Tp*)): Inline.
+
 2007-05-13  Paolo Carlini  <pcarlini@suse.de>
 
 	* include/tr1/type_traitsfwd.h: Fix include guard typo.
diff --git a/libstdc++-v3/include/bits/stl_tempbuf.h b/libstdc++-v3/include/bits/stl_tempbuf.h
index 46c733feb5c..9cf16203a76 100644
--- a/libstdc++-v3/include/bits/stl_tempbuf.h
+++ b/libstdc++-v3/include/bits/stl_tempbuf.h
@@ -124,9 +124,9 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
    *  Frees the memory pointed to by p.
    */
   template<typename _Tp>
-    void
+    inline void
     return_temporary_buffer(_Tp* __p)
-    { ::operator delete(__p, nothrow); }
+    { ::operator delete(__p, std::nothrow); }
 
 
   /**