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

[Dan Mashal]

commit d59eb231a5c9cb1040ab241ee559f83e87f1b1ad
Merge: 2e3b173 80f8e78
Author: Dan Mashal <dan.mashal at gmail.com>
Date:   Tue Dec 11 05:10:43 2012 -0800

    Merge branch 'master' into f17

 commits_rollup.patch |  301 +++++++++++++-------------------------------------
 mate-media.spec      |   10 +-
 2 files changed, 85 insertions(+), 226 deletions(-)
---