Summary of changes: a2e61fb... - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass (*) ae48277... Release 3.0.5-1 (*) a980928... fix merge errors (*) 8ef9d5f... fix merge issues (*) This commit already existed in another branch; no separate mail sent