[kdemultimedia/f18: 6/6] Merge branch 'master' into f18

[Rex Dieter]

commit abc24a9f33c1526b03d639d8eecdf526a1337d11
Merge: 014b622 24c5271
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Mar 4 13:17:18 2013 -0600

    Merge branch 'master' into f18
    
    Conflicts:
    	kdemultimedia.spec

 kdemultimedia.spec |   19 ++++++++++++++-----
 1 files changed, 14 insertions(+), 5 deletions(-)
---