[graphviz/f16: 3/3] Merge branch 'master' into f16

[Jaroslav Škarvada]

commit af852cdb2c8ecf1f8eaa2242cd1ad6f9e06a916f
Merge: a3b6a64 ae79b6d
Author: Jaroslav Škarvada <jskarvad at redhat.com>
Date:   Sun Dec 11 22:03:52 2011 +0100

    Merge branch 'master' into f16
    
    Conflicts:
    	graphviz.spec

 graphviz.spec |  115 ++++++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 98 insertions(+), 17 deletions(-)
---