[kdemultimedia/f17: 8/8] Merge branch 'master' into f17

[Rex Dieter]

commit 8d133b4478ecddfc3e110a82a359aa2dd8c70e16
Merge: 33aac2c f030176
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Sep 8 12:01:01 2012 -0500

    Merge branch 'master' into f17
    
    Conflicts:
    	kdemultimedia.spec
    	sources

 .gitignore                          |    2 -
 kdemultimedia-4.6.2-no_thumbs.patch |   16 --
 kdemultimedia.spec                  |  328 +++++------------------------------
 sources                             |    1 -
 4 files changed, 45 insertions(+), 302 deletions(-)
---