[media-explorer/f16] (5 commits) ...fix merge

[Peter Robinson]

Summary of changes:

  839dda2... Import (*)
  985276b... rebuild for new clutter/cogl (*)
  4ced1bf... 0.3.4 (*)
  3436719... fix version (*)
  a665045... fix merge

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