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

[Rex Dieter]

commit ec09fe13fd7bbcf8c0f38d5da8afda4b8f471ed1
Merge: 67484df adcfbc3
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Aug 3 06:56:26 2012 -0500

    Merge branch 'f17' into f16

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