Summary of changes: c4d2a96... Update to latest upstream version (2012.06.07). Add a patch (*) be06357... Merge branch 'master' into f17 (*) This commit already existed in another branch; no separate mail sent