0025161 Rebase one patch to apply properly.

Authored and Committed by tibbs 7 years ago
    Rebase one patch to apply properly.
    
        
file added
+1
file modified
+22 -20
file modified
+4 -1