[kdegraphics/f13/master: 33/33] Merge remote branch 'origin/master' into f13/master

[Rex Dieter]

commit a3f3ae2ddf499544045e2ce16ea20940ce9ec902
Merge: 1081ada 32ea988
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Oct 21 21:24:58 2010 -0500

    Merge remote branch 'origin/master' into f13/master
    
    Conflicts:
    	.gitignore
    	kdegraphics.spec
    	sources

 .gitignore                                         |    2 +-
 kdegraphics-4.5.1-okular_dt.patch                  |   10 ++
 kdegraphics-4.5.2-okular_xps_hack.patch            |   12 +++
 kdegraphics-okular-cve-2010-2575.patch             |   29 ------
 kdegraphics.spec                                   |  104 +++++++++++++++----
 ...246675_crash_digikam-1_2_0-kexiv2exif.cpp.patch |   11 --
 ...46675_crash_digikam-1_2_0-kexiv2image.cpp.patch |   68 -------------
 sources                                            |    2 +-
 8 files changed, 106 insertions(+), 132 deletions(-)
---