[kdegraphics/f14/master: 2/2] Merge branch 'master' into f14

[Rex Dieter]

commit 8cf47b9a0a19bcfb332943520fcf7dd1ca80b8d9
Merge: 872d956 7277661
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sun Aug 29 12:33:48 2010 -0500

    Merge branch 'master' into f14

 .gitignore                             |    2 +-
 kdegraphics-okular-cve-2010-2575.patch |   29 -----------------------------
 kdegraphics.spec                       |   10 +++++-----
 sources                                |    2 +-
 4 files changed, 7 insertions(+), 36 deletions(-)
---