[mesa-freeworld/f37] (2 commits) ...Merge branch 'master' into f37
Summary of changes:
72b2519... Add conflicts to resolve dependencies from Fedora repo on u (*)
7e171b3... Merge branch 'master' into f37
(*) This commit already existed in another branch; no separate mail sent