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

[Rex Dieter]

commit 40300a006603bb8f8238e642070969d16328fc45
Merge: 02788b2 efd1b47
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Mar 30 10:56:12 2012 -0500

    Merge branch 'master' into f16

 .gitignore  |    1 +
 okular.spec |   10 ++++++++--
 sources     |    2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)
---