diff --git a/ChangeLog b/ChangeLog
index 4a8e225e5..9a823b38c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-04-26  Mike Kestner  <mkestner@novell.com>
+
+	* gtk/NodeStore.cs : implement IEnumerable.
+
 2005-04-24  Dan Winship  <danw@novell.com>
 
 	* pango/Attribute.cs: Base class for Pango attributes, a la
diff --git a/doc/en/Gtk/NodeStore.xml b/doc/en/Gtk/NodeStore.xml
index aa3f7c6c9..fb9399e76 100644
--- a/doc/en/Gtk/NodeStore.xml
+++ b/doc/en/Gtk/NodeStore.xml
@@ -130,5 +130,18 @@
         </remarks>
       </Docs>
     </Member>
+    <Member MemberName="GetEnumerator">
+      <MemberSignature Language="C#" Value="public virtual System.Collections.IEnumerator GetEnumerator ();" />
+      <MemberType>Method</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Collections.IEnumerator</ReturnType>
+      </ReturnValue>
+      <Parameters />
+      <Docs>
+        <summary>Gets an enumerator for the root nodes.</summary>
+        <returns>a <see cref="T:System.Collections.IEnumerator" /></returns>
+        <remarks>Children of root nodes are not enumerated.  You must traverse them independently.</remarks>
+      </Docs>
+    </Member>
   </Members>
-</Type>
\ No newline at end of file
+</Type>
diff --git a/gtk/NodeStore.cs b/gtk/NodeStore.cs
index 60c6f9403..ead8f91f3 100644
--- a/gtk/NodeStore.cs
+++ b/gtk/NodeStore.cs
@@ -26,7 +26,7 @@ namespace Gtk {
 	using System.Reflection;
 	using System.Runtime.InteropServices;
 
-	public class NodeStore : GLib.Object {
+	public class NodeStore : GLib.Object, IEnumerable {
 
         	class IDHashtable : Hashtable {
                 	class IDComparer : IComparer {
@@ -472,5 +472,10 @@ namespace Gtk {
 				return new GLib.GType (gtksharp_node_store_get_type ());
 			}
 		}
+
+		public IEnumerator GetEnumerator ()
+		{
+			return nodes.GetEnumerator ();
+		}
 	}
 }