a0da117 Merge cleanup

Merged and Committed by Petr Šabata 9 years ago
    Merge cleanup
    
    Signed-off-by: Petr Šabata <contyk@redhat.com>
    
        
file modified
+1 -0
file modified
+6 -3
file modified
+1 -1