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

[Rex Dieter]

commit 9b31d68de9712ed3614a9d43efefacad25c8910b
Merge: 8e9c512 23f8020
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Oct 19 11:53:54 2010 -0500

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

 kdegraphics-4.5.2-okular_xps_hack.patch |   12 ++++++++++++
 kdegraphics.spec                        |   10 +++++++++-
 2 files changed, 21 insertions(+), 1 deletions(-)
---