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

[Rex Dieter]

commit 52d84585a9e4e2f3730cad570ac19e67e3ca62f9
Merge: af56f12 8becc52
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Aug 2 12:31:35 2012 -0500

    Merge branch 'f17' into f16

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