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

[Rex Dieter]

commit a0b62637c8ba96dbe9101c908a0ff9ab74ab1987
Merge: fe8a531 206136f
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Oct 22 08:50:25 2010 -0500

    Merge remote branch 'origin/master' into f13/master
    
    Conflicts:
    	.gitignore
    	kdemultimedia.spec
    	kmix-pulse.patch
    	sources

 .gitignore                                 |    2 +-
 kdemultimedia-4.3.75-nomplayerthumbs.patch |   16 -
 kdemultimedia-4.5.1-no_mplayerthumbs.patch |   12 +
 kdemultimedia.spec                         |   42 +-
 kmix-pulse.patch                           | 2986 ----------------------------
 sources                                    |    2 +-
 6 files changed, 37 insertions(+), 3023 deletions(-)
---