cda7a1 - fix multilib file conflict

Authored and Committed by Ivana Varekova 16 years ago
1 file changed. 6 lines added. 1 lines removed.
    - fix multilib file conflict
    
        
file modified
+6 -1