cad16ca Rebase to latest upstream version (0.9.2)

Authored and Committed by branto 9 years ago
    Rebase to latest upstream version (0.9.2)
    
    Resolves: rhbz#1220598
    
        
file modified
+2 -0
file modified
+5 -2
file modified
+2 -2