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

[Rex Dieter]

commit 34ea2a151a4f84f470a9d169bdb93658e409a8f9
Merge: 5aed7e6 b31ccad
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Nov 4 12:47:23 2011 -0500

    Merge branch 'master' into f16

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