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

[Than Ngo]

commit 872d956d8e98bc77c67c8b9cabeb818075d80e3b
Merge: 2c97e8d cb8ac38
Author: Than Ngo <than at redhat.com>
Date:   Wed Aug 25 23:15:48 2010 +0200

    Merge branch 'master' into f14
    
    Conflicts:
    	kdegraphics.spec

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