[okular/f17: 14/14] Merge branch 'master' into f17

[Rex Dieter]

commit 19deb8a7528eaf61fe7c8a43d7b7434ba0eb0b24
Merge: e0a7758 4d3ac18
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Sep 4 22:05:18 2012 -0500

    Merge branch 'master' into f17
    
    Conflicts:
    	.gitignore
    	okular.spec
    	sources

 .gitignore  |    3 +--
 okular.spec |   40 ++++++++++++++++++++++++++--------------
 sources     |    2 +-
 3 files changed, 28 insertions(+), 17 deletions(-)
---