61adb03 Fix patch to apply

Authored and Committed by sbergmann 9 years ago
    Fix patch to apply
    
    (cherry picked from commit 2b5a69f5ca6819b40286221c7252804d042067b5)