Summary of changes: 95f4554... Update to upstream version, rhbz #1069202. (*) f74e054... Merge branch 'master' into el5 (*) This commit already existed in another branch; no separate mail sent