Summary of changes: a1182c6... - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass (*) c55e987... Fix merge conflicts (*) This commit already existed in another branch; no separate mail sent