[graphviz/f19: 2/2] Merge remote-tracking branch 'origin/master' into f19

[Jaroslav Škarvada]

commit 322c372f22287a8f3dfcf430008784b5064b139d
Merge: 01612c6 bcc522e
Author: Jaroslav Škarvada <jskarvad at redhat.com>
Date:   Mon Mar 25 15:23:18 2013 +0100

    Merge remote-tracking branch 'origin/master' into f19
    
    Conflicts:
    	graphviz.spec

 graphviz.spec |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)
---