[kdegraphics/f14/master: 19/19] Merge remote-tracking branch 'origin/master' into f14

[Jaroslav Reznik]

commit ccb2611b38ed4d1f8904087aac4e55ddf792c390
Merge: d38e8e1 d88eb34
Author: Jaroslav Reznik <jreznik at redhat.com>
Date:   Wed Mar 16 15:16:03 2011 +0100

    Merge remote-tracking branch 'origin/master' into f14
    
    Conflicts:
    	.gitignore
    	kdegraphics.spec
    	sources

 .gitignore                                         |    2 +-
 ...s-4.5.80-OkularConfig-dont-hardcode-paths.patch |   30 ++++++++++
 kdegraphics-4.6.0-libjpeg-version.patch            |   34 ++++++++++++
 kdegraphics-4.6.0-libjpeg_version-2.patch          |   11 ++++
 kdegraphics-4.6.1-libjpeg_version.patch            |   35 ++++++++++++
 kdegraphics.spec                                   |   58 +++++++++++++++-----
 sources                                            |    2 +-
 7 files changed, 155 insertions(+), 17 deletions(-)
---