[libXvMC/f19: 3/3] Merge branch 'master' into f19

[Peter Hutterer]

commit 2abffc14959df117e6798fd194477a588fe2695b
Merge: a65e8ee 65a5e2e
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Tue May 28 10:35:36 2013 +1000

    Merge branch 'master' into f19
    
    Conflicts:
    	libXvMC.spec

 libXvMC.spec |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)
---