[kdemultimedia/f16: 2/2] Merge branch 'master' into f16

[Rex Dieter]

commit 5868f11f0c433d48866a75556ffcedf17076c652
Merge: d1aea8c aea2363
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Apr 30 22:57:18 2012 -0500

    Merge branch 'master' into f16

 .gitignore                                         |    3 +-
 ...-Prevent-kmixctrl-running-with-PulseAudio.patch |   32 -
 kdemultimedia-4.8.2-kmix_backport.patch            | 4445 --------------------
 kdemultimedia.spec                                 |   18 +-
 sources                                            |    2 +-
 5 files changed, 7 insertions(+), 4493 deletions(-)
---