c5ffd2d backport multilib fixes

Authored and Committed by notting 16 years ago
    backport multilib fixes
    
        
file added
+26
file modified
+6 -1