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

[Rex Dieter]

commit 088e2bff59b0e052175d0de39b8638b1cf16f247
Merge: a342afd 014b622
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Dec 29 07:45:18 2012 -0600

    Merge branch 'f18' into f17

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