[kde-wallpapers/f17: 9/9] Merge branch 'master' into f17

[Rex Dieter]

commit c289eb0c72660c51c250b0da13901630d0407019
Merge: 8becc52 2665291
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Sep 4 15:35:19 2012 -0500

    Merge branch 'master' into f17
    
    Conflicts:
    	.gitignore
    	kde-wallpapers.spec
    	sources

 .gitignore          |    3 +--
 kde-wallpapers.spec |   25 ++++++++++++++++++++-----
 sources             |    2 +-
 3 files changed, 22 insertions(+), 8 deletions(-)
---