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

[Rex Dieter]

commit 3f92678f382d41470d18330f04769378a7e61d2c
Merge: 6b57fc5 206136f
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sun Oct 3 05:54:29 2010 -0500

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

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