Summary of changes: 70c469c... Fix multilib conflict RHBZ#831432 (*) 2cb6954... remove redundant bits from patch (*) (*) This commit already existed in another branch; no separate mail sent