[okular/f16: 9/9] Merge remote-tracking branch 'origin/f17' into f16

[Rex Dieter]

commit 02788b25fa28369f7507dd2fec9a915b1c308763
Merge: 029c574 788ebda
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Mar 7 21:27:22 2012 -0600

    Merge remote-tracking branch 'origin/f17' into f16
    
    Conflicts:
    	.gitignore
    	okular.spec
    	sources

 .gitignore                                |    3 +-
 kdegraphics-4.6.90-okular-landscape.patch |  427 -----------------------------
 okular-4.7.4-kdebug291278.patch           |   23 --
 okular.spec                               |   98 ++++---
 sources                                   |    2 +-
 5 files changed, 60 insertions(+), 493 deletions(-)
---