[kdemultimedia/f13/master: 3/3] Merge remote branch 'origin/f14/master' into f13/master

[Rex Dieter]

commit 16e376233010611f7de2c17197693a93bf1b0b85
Merge: 08f619d d77d224
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Jan 6 10:30:30 2011 -0600

    Merge remote branch 'origin/f14/master' into f13/master

 .gitignore         |    4 +---
 kdemultimedia.spec |    5 ++++-
 sources            |    2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)
---