1853c99 Fix the build

Authored and Committed by kalev 9 years ago
    Fix the build
    
    Rebase the patches from the previous commit on top of 2.44.0. Commit
    b574d9a08ef7e5d8724e162e2dfbd88bb247d437 was originally for 2.40.0 and
    the patches no longer applied cleanly.
    
        
file modified
+0 -2