[mate-media/f17] (6 commits) ...Merge branch 'master' into f17

[Dan Mashal]

Summary of changes:

  a066e52... Revert "initial import" (*)
  7a97a2d... Merge branch 'master' into f18 (*)
  501b25b... Merge branch 'master' into f18 (*)
  f155ca5... Merge branch 'master' into f18 (*)
  80f8e78... remove duplicate configure flags, update patch (*)
  d59eb23... Merge branch 'master' into f17

(*) This commit already existed in another branch; no separate mail sent