a352ea2 Fix multi-arch conflict again (#816969)

Authored and Committed by pghmcfc 11 years ago
1 file changed. 6 lines added. 3 lines removed.
    Fix multi-arch conflict again (#816969)
    
        
file modified
+6 -3