86e9bad start fixing multilib conflicts

Authored and Committed by notting 17 years ago
    start fixing multilib conflicts
    
        
file modified
+108 -56
file modified
+6 -3