Merge branch 'master' of hg:graphviz

Conflicts:
	doc/info/attrs.html
	doc/infosrc/attrs
	lib/dotgen/aspect.c

diff --cc lib/dotgen/aspect.c
index 42cfa20fc00db3d7a89cc042ec8c1508656824ed,7fe895d279df2c075f07dc5bf11e76aa42c3f6c9..684b41e1be06a973b19a11a141868bbbb850dc5e
--- 1/lib/dotgen/aspect.c
--- 2/lib/dotgen/aspect.c
+++ b/lib/dotgen/aspect.c
@@@ -1988,11 -1988,7 +1988,10 @@@ setAspect (Agraph_t * g, aspect_t* adat
        adata->badGraph = 0;
        return NULL;
      }
 -    agerr(AGWARN, "The aspect attribute is currently disabled in dot - ignored\n");
 +    agerr (AGWARN, "the aspect attribute has been disabled due to implementation flaws - attribute ignored.\n");
-     
 +    adata->nextIter = 0;
 +    adata->badGraph = 0;
 +    return NULL;
      
      if (rv < MIN_AR) rv = MIN_AR;
      else if (rv > MAX_AR) rv = MAX_AR;