23d549a fix multilib conflicts

Authored and Committed by mclasen 17 years ago
    fix multilib conflicts
    
        
file modified
+6 -3