Summary of changes: 38dd085... Update to latest upstream version (2012.06.02); change Lice (*) 50f64a8... Merge branch 'master' into f17 (*) This commit already existed in another branch; no separate mail sent