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

[Than Ngo]

commit 34d159479de5874e4da17087d32ee3b252b0e207
Merge: 9b52679 41ebb1c
Author: Than Ngo <than at redhat.com>
Date:   Fri Dec 7 10:33:50 2012 +0100

    Merge branch 'f18' into f17

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