Summary of changes: 5699fc4... Update to latest upstream version (2012.07.02). (*) 54ad9cc... Merge branch 'master' into f17 (*) This commit already existed in another branch; no separate mail sent