b3893df Merge branch 'f20'

Merged and Committed by Petr Spacek 9 years ago
    Merge branch 'f20'
    
    Signed-off-by: Petr Spacek <pspacek@redhat.com>
    
        
file modified
+1 -0
file modified
+5 -2
file modified
+1 -1