[kde-wallpapers/f17: 2/2] Merge branch 'f18' into f17

[Rex Dieter]

commit 419169bc73bc5115bb05da2c433a131f1d35e56f
Merge: c289eb0 a661bf4
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Sep 29 13:15:30 2012 -0500

    Merge branch 'f18' into f17

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