Summary of changes: 0fff88a... Update to latest upstream version (2012.06.12) (*) 67a262d... Merge branch 'master' into f17 (*) This commit already existed in another branch; no separate mail sent