Summary of changes: 711f825... fix conflict rhbz#1114135 (*) 75f8bee... fix conflict rhbz#1114135 (*) (*) This commit already existed in another branch; no separate mail sent