d56d30e Fix up gcc46 patch.

Authored and Committed by bruno 12 years ago
    Fix up gcc46 patch.
    
    Some context changes and some upsteam.
    
        
file modified
+2 -2