[kdemultimedia/f19: 7/7] Merge branch 'master' into f19

[Rex Dieter]

commit 72ff24bb258a91b3fadf9e3adb2d7d3ab1fb21bc
Merge: 5621a90 1a04ab0
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Thu Sep 5 13:21:01 2013 -0500

    Merge branch 'master' into f19

 kdemultimedia.spec |   17 ++++++++++++++++-
 1 files changed, 16 insertions(+), 1 deletions(-)
---