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

[Rex Dieter]

commit d1aea8c7bc57bd89efc03c2e36dfaecd2442a083
Merge: 23d1326 081a614
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Apr 25 22:37:57 2012 -0500

    Merge branch 'master' into f16

 ...-Prevent-kmixctrl-running-with-PulseAudio.patch |   32 +
 kdemultimedia-4.8.2-kmix_backport.patch            | 4445 ++++++++++++++++++++
 kdemultimedia.spec                                 |   24 +-
 3 files changed, 4500 insertions(+), 1 deletions(-)
---