[kdegraphics/f14/master: 3/3] Merge remote branch 'origin/master' into f14/master

[Rex Dieter]

commit db0b677f7a57f30aec75591f5e8af57d195feba1
Merge: f0c3cde da6e3b6
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sun Nov 7 18:38:51 2010 -0600

    Merge remote branch 'origin/master' into f14/master

 .gitignore                              |    1 +
 kdegraphics-4.5.2-okular_xps_hack.patch |   12 ------------
 kdegraphics.spec                        |   21 ++++++++++++++-------
 sources                                 |    2 +-
 4 files changed, 16 insertions(+), 20 deletions(-)
---