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

[Dan Mashal]

commit 7b1629ebb2276d1a7e87c71f4d9418575ed0a69a
Merge: d59eb23 d1c4785
Author: Dan Mashal <dan.mashal at gmail.com>
Date:   Wed Dec 26 03:11:19 2012 -0800

    Merge branch 'master' into f17

 mate-media.spec |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)
---