Automated merge with ssh://hg.research.att.com//home/hgroot/graphviz
authorEmden Gansner <erg@research.att.com>
Wed, 14 Dec 2011 17:37:43 +0000 (12:37 -0500)
committerEmden Gansner <erg@research.att.com>
Wed, 14 Dec 2011 17:37:43 +0000 (12:37 -0500)

Trivial merge