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

[Rex Dieter]

commit 23d132670ca2a9ba7d14a8c6684cc9672260f37d
Merge: ec78140 17b2d08
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Mar 30 13:59:35 2012 -0500

    Merge branch 'master' into f16

 .gitignore         |    1 +
 kdemultimedia.spec |    5 ++++-
 sources            |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---