commit a567d6eb8ffa2d791010c29d93ddb6186637b331 Merge: 4bc2db2 f391dc1 Author: Rex Dieter <rdieter at fedoraproject.org> Date: Thu Jun 7 19:00:39 2012 -0500 Merge branch 'f17' into f16 .gitignore | 1 + okular.spec | 20 +++++++++++++++++--- sources | 2 +- 3 files changed, 19 insertions(+), 4 deletions(-) ---