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

[Rex Dieter]

commit f0c3cdea93f6578fb0d3efac23e1bc33d1939daf
Merge: 9b31d68 32ea988
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Oct 20 08:15:35 2010 -0500

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

 kdegraphics-4.5.2-okular_xps_hack.patch |    2 +-
 kdegraphics.spec                        |   13 ++++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)
---