Automated merge with ssh://hg.research.att.com//home/hgroot/graphviz

diff --cc lib/common/utils.c
Simple merge

diff --cc tclpkg/gv/Makefile.am
index b7f3b08c3d990ff66982d30f1be140696fb6c167,981e74b2a980901534bcf4749061c1a998bbd89c..bc5f608604d4cab1a37d0e84635d0d00cc36874a
--- 1/tclpkg/gv/Makefile.am
--- 2/tclpkg/gv/Makefile.am
+++ b/tclpkg/gv/Makefile.am
@@@ -256,9 -256,9 +256,9 @@@ libgv_tcl_la_LDFLAGS = -module -avoid-v
  libgv_tcl_la_CPPFLAGS = $(BASECPPFLAGS) $(TCL_INCLUDES)
  # $(TCL_data): gv_tcl.cpp
  gv_tcl.cpp: gv.i
-       $(SWIG) -c++ -tcl -namespace -o gv_tcl.cpp $(srcdir)/gv.i
+       $(SWIG) $(DEFS) -c++ -tcl -namespace -o gv_tcl.cpp $(srcdir)/gv.i
  
 -pkginclude_DATA = gv.i gv.cpp
 +pkginclude_HEADERS = gv.i gv.cpp
  pkglib_LTLIBRARIES = 
  man_MANS =
  pdf_DATA =