diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index 559b435f0..6cfc9a964 100644
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,7 @@
+Wed Aug 16 13:55:39 2006  Tim Janik  <timj@imendio.com>
+
+	* glib/tmpl/trash_stack.sgml: added notes about complexity.
+
 2006-08-15  Matthias Clasen  <mclasen@redhat.com>
 
 	* === Released 2.12.2 ===
diff --git a/docs/reference/glib/tmpl/trash_stack.sgml b/docs/reference/glib/tmpl/trash_stack.sgml
index ac1fa3844..d862b5e89 100644
--- a/docs/reference/glib/tmpl/trash_stack.sgml
+++ b/docs/reference/glib/tmpl/trash_stack.sgml
@@ -54,7 +54,7 @@ Pops a piece of memory off a #GTrashStack.
 
 <!-- ##### FUNCTION g_trash_stack_peek ##### -->
 <para>
-Returns the element at the top of a #GTrashStack.
+Returns the element at the top of a #GTrashStack which may be %NULL.
 </para>
 
 @stack_p: a pointer to a #GTrashStack.
@@ -64,6 +64,8 @@ Returns the element at the top of a #GTrashStack.
 <!-- ##### FUNCTION g_trash_stack_height ##### -->
 <para>
 Returns the height of a #GTrashStack.
+Note that execution of this function is of O(N) complexity
+where N denotes the number of items on the stack.
 </para>
 
 @stack_p: a pointer to a #GTrashStack.