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

[Rex Dieter]

commit 4bc2db2c0c93913360fc1c9e6711c44828e7264b
Merge: 40300a0 2076055
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Apr 30 19:20:09 2012 -0500

    Merge branch 'master' into f16

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