616387 - Use upstream fix for adjustment of conflicting options (bug #533426, STR

Authored and Committed by twaugh 9 years ago
    - Use upstream fix for adjustment of conflicting options (bug #533426, STR
        #3439).
    
        
file modified
+121 -7
file modified
+2 -0