Pushed 1.3.12 to trunk.

src/zone.h

Index: src/zone.h
===================================================================
--- src/zone.h	(revision 2947)
+++ src/zone.h	(working copy)
@@ -204,10 +204,6 @@
 };
 
 
-template <typename Node, class Callback>
-static void DoForEach(Node* node, Callback* callback);
-
-
 // A zone splay tree.  The config type parameter encapsulates the
 // different configurations of a concrete splay tree:
 //
@@ -297,9 +293,7 @@
   };
 
   template <class Callback>
-  void ForEach(Callback* c) {
-    DoForEach<typename ZoneSplayTree<Config>::Node, Callback>(root_, c);
-  }
+  void ForEach(Callback* callback);
 
  private:
   Node* root_;