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

[Rex Dieter]

commit 7377c379429a9cd00dea1b3383599cc4260421e9
Merge: d01fe2a c4eb0ce
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Jun 7 20:16:26 2012 -0500

    Merge branch 'f17' into f16

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