[okular/f18: 9/9] Merge branch 'master' into f18

[Rex Dieter]

commit 8ed0edc285c9b058c1f266f77e617f6d7434fb89
Merge: b665a9c b3979b4
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sun Mar 3 18:02:05 2013 -0600

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

 .gitignore  |    7 +------
 okular.spec |   52 +++++++++++++++++++++++++++++++++++++---------------
 sources     |    2 +-
 3 files changed, 39 insertions(+), 22 deletions(-)
---