merge changes except to features/common

diff --cc Makefile.am
index 3784dcf455689b1483015608a14382c823dc8f8d,e40f40b42d5372a210b57ad4fe36a9b554049847..09181e79eb349324d1457b10057beac7f9b1c36a
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -38,12 -38,12 +38,12 @@@ $(top_builddir)/graphviz_version.h: con
  EXTRA_DIST = $(txt) $(html) graphviz.spec.in graphviz.spec \
        autogen.sh config/depcomp config/config.rpath \
        builddate.h ast_common.h.in compat.h \
 -      Makeargs compat_getopt.h iffe config.iffe \
 +      Makeargs iffe config.iffe \
        m4/README m4/iconv.m4 m4/lib-ld.m4 m4/lib-link.m4 m4/lib-prefix.m4 \
-       graphviz.7 Doxyfile.in Doxyfile features awk \
+       graphviz.7 Doxyfile.in Doxyfile awk \
        config/config_perl.pl config/config_python.py \
        config/config_ruby.rb config/config_tcl.tcl dot.demo  plugin.demo \
-       macosx windows debian graphviz.vcproj graphviz.sln
+       macosx windows debian graphviz.sln
  
  .PHONY: rpm
  rpm: dist