[mate-media/f17: 4/4] Merge branch 'master' into f17

[Dan Mashal]

commit 1dea25b367931b0ba162654502ea74c45066e354
Merge: 0aa84e5 060ed13
Author: Dan Mashal <dan.mashal at fedoraproject.org>
Date:   Tue May 28 07:40:47 2013 -0700

    Merge branch 'master' into f17

 .gitignore           |    1 +
 commits_rollup.patch |   97 --------------------------------------------------
 mate-media.spec      |   11 ++++--
 sources              |    2 +-
 4 files changed, 9 insertions(+), 102 deletions(-)
---