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

[Dan Mashal]

commit 7a97a2dbe763ae7298387041e0629e3b075216b5
Merge: a066e52 45cff63
Author: Dan Mashal <dan.mashal at fedoraproject.org>
Date:   Sun Nov 4 01:00:20 2012 -0500

    Merge branch 'master' into f18
    
    Conflicts:
    	mate-media.spec

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