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

[Than Ngo]

commit a342afdf79218551beb3dcf683ea2d022eb2a3b4
Merge: 5c37066 435d5c4
Author: Than Ngo <than at redhat.com>
Date:   Thu Dec 6 15:50:45 2012 +0100

    Merge branch 'f18' into f17

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