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