Summary of changes: 6acab8f... Update to latest upstream version (2012.07.08) (*) 0559d7e... Merge branch 'master' into f17 (*) This commit already existed in another branch; no separate mail sent