4574ca4 Rebase to 5.1.5 (rhbz#1111013)

Authored and Committed by jwrdegoede 9 years ago
    Rebase to 5.1.5 (rhbz#1111013)
    
        
file modified
+1 -0
file modified
+9 -8
file removed
-195
file modified
+3 -3
file modified
+1 -1