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

[Rex Dieter]

commit 92f5f3cc276cacc9446fe477c248e5f2fbfc1e43
Merge: 34d1594 962bcb0
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Dec 29 06:42:27 2012 -0600

    Merge branch 'f18' into f17

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