[gwenview/f16: 2/2] Merge branch 'f17' into f16

[Rex Dieter]

commit 67484df6e6588cfd778c3a26c3ae2def6b8e539a
Merge: 8bae634 e537980
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Jun 7 20:13:04 2012 -0500

    Merge branch 'f17' into f16

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