373fc9d fixed conflict with report rhbz#723320

Authored and Committed by Jiri Moskovcak 12 years ago
    fixed conflict with report rhbz#723320
    
        
file renamed
+19 -2
file modified
+62 -25
file removed
-6