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

[Rex Dieter]

commit 4981dfc6c26fb3011771bc1ec3ec96c21bce177f
Merge: 9607441 008050b
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Jun 8 14:01:22 2012 -0500

    Merge branch 'f17' into f16

 kdemultimedia.spec |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)
---