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

[Dan Mashal]

commit 2e3b1738572d9ea8d52c41505d2cd86a1be7e990
Merge: bb5ca5f b558c69
Author: Dan Mashal <dan.mashal at gmail.com>
Date:   Mon Dec 10 22:56:35 2012 -0800

    Merge branch 'master' into f17

 .gitignore           |    1 +
 commits_rollup.patch |  240 ++++++++++++++++++++++++++++++++++++++++++++++++++
 mate-media.spec      |   64 ++++++++++----
 sources              |    2 +-
 4 files changed, 288 insertions(+), 19 deletions(-)
---