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

[Rex Dieter]

commit af56f122ec658bdc3489e2a01e58b2a5a5d08cf0
Merge: 6e70284 4ee8cfd
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Jun 7 13:03:20 2012 -0500

    Merge branch 'f17' into f16

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