Brand new version of files/code to merge zmap foocanvas into foocanvas.

foocanvas/zmap_source/libfoocanvas/libfoocanvas.h.diff

+--- ./merged_foocanvas/libfoocanvas/libfoocanvas.h	2010-03-09 10:49:06.539000000 +0000
++++ ./zmap_foocanvas/libfoocanvas/libfoocanvas.h	2008-03-25 09:07:37.000000000 +0000
+@@ -1,3 +1,4 @@
++/*  Last edited: Jan 24 09:17 2008 (rds) */
+ /*
+  * Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation
+  * All rights reserved.
+@@ -35,6 +36,10 @@
+ #include <libfoocanvas/foo-canvas-rect-ellipse.h>
+ #include <libfoocanvas/foo-canvas-util.h>
+ 
++#include <libfoocanvas/foozmap-canvas-line-glyph.h>
++#include <libfoocanvas/foozmap-canvas-text.h>
++#include <libfoocanvas/foozmap-canvas-floating-group.h>
++
+ G_BEGIN_DECLS
+ 
+ GType foo_canvas_points_get_type (void);