6d18423 Backport multilib fixes from devel.

Authored and Committed by bojan 16 years ago
    Backport multilib fixes from devel.
    
        
file added
+12
file modified
+20 -2