[kdemultimedia/f16: 10/10] Merge remote-tracking branch 'origin/f17' into f16

[Rex Dieter]

commit ec781402c3655842073ee771580c699135fa3278
Merge: 6bead09 2a8147e
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Mar 7 23:25:18 2012 -0600

    Merge remote-tracking branch 'origin/f17' into f16
    
    Conflicts:
    	.gitignore
    	kdemultimedia.spec
    	sources

 .gitignore                                         |    4 +-
 ...imedia-4.7.1-dragonplayer-phonon-dvd-menu.patch |  258 --------------------
 kdemultimedia-4.7.4-kscd.patch                     |   15 --
 kdemultimedia.spec                                 |   52 +++--
 sources                                            |    2 +-
 5 files changed, 34 insertions(+), 297 deletions(-)
---