[okular/f16: 2/2] Merge branch 'master' into f16

[Rex Dieter]

commit 5aed7e6bef2d5ca29915577de7f71245fd8ac5e8
Merge: 1bde43e 10103e5
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Oct 5 08:37:03 2011 -0500

    Merge branch 'master' into f16
    
    Conflicts:
    	okular.spec

 .gitignore  |    3 +--
 okular.spec |    8 ++++----
 sources     |    2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)
---