b4c940f Fix multiarch conflicts again (#477718)

Authored and Committed by andriy 15 years ago
    Fix multiarch conflicts again (#477718)