commit a943a059fd624728963785741ed15c4df69852e8 Merge: 088e2bf 67288d1 Author: Rex Dieter <rdieter at math.unl.edu> Date: Fri Mar 8 09:16:06 2013 -0600 Merge branch 'f18' into f17 kdemultimedia.spec | 22 +++++++++++++++++----- 1 files changed, 17 insertions(+), 5 deletions(-) ---