[kdemultimedia/f14/master: 6/6] Merge branch 'master' into f14

[Rex Dieter]

commit 6b57fc56b2758cada648cfcadc415472ba1bedb4
Merge: 5d5416f eff236f
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sun Aug 29 14:54:19 2010 -0500

    Merge branch 'master' into f14
    
    Conflicts:
    	.gitignore
    	kdemultimedia.spec
    	sources

 .gitignore                                 |    2 +-
 kdemultimedia-4.3.75-nomplayerthumbs.patch |   16 ----------------
 kdemultimedia-4.5.1-no_mplayerthumbs.patch |   12 ++++++++++++
 kdemultimedia.spec                         |    9 ++++++---
 sources                                    |    2 +-
 5 files changed, 20 insertions(+), 21 deletions(-)
---