Summary of changes: 777e532... recompiling .py files against Python 2.7 (rhbz#623378) (*) e106d70... Release 24 (*) 5d1dcb7... Fix merge issues (*) 2b97378... Fix merge issues (*) This commit already existed in another branch; no separate mail sent