[kdegraphics/f12/master: 32/32] Merge remote branch 'origin/f13/master' into f12

[Than Ngo]

commit ac8d9baee94c9e684016a7d3db8df0cdf5d1ddd2
Merge: 017ea88 11cff3a
Author: Than Ngo <than at redhat.com>
Date:   Thu Aug 26 00:25:04 2010 +0200

    Merge remote branch 'origin/f13/master' into f12

 kdegraphics-okular-cve-2010-2575.patch |   29 +++++++++++++++++++++++++++++
 kdegraphics.spec                       |   10 +++++++++-
 2 files changed, 38 insertions(+), 1 deletions(-)
---