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

[Rex Dieter]

commit 55f6f5e57db7a6291adc9a296d219079dbe786de
Merge: 1cecf35 f8b6e57
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Sep 29 16:58:21 2012 -0500

    Merge branch 'f18' into f17

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