[kde-wallpapers/f16: 11/11] Merge remote-tracking branch 'origin/f17' into f16

[Rex Dieter]

commit 695651339d72b9ca9ac3a6e3d3e23b2aaee2fc57
Merge: 47bbd7d 699f5a6
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Mar 8 00:06:32 2012 -0600

    Merge remote-tracking branch 'origin/f17' into f16
    
    Conflicts:
    	.gitignore
    	kde-wallpapers.spec
    	sources

 .gitignore          |    2 +-
 kde-wallpapers.spec |   35 ++++++++++++++++++++++++++---------
 sources             |    2 +-
 3 files changed, 28 insertions(+), 11 deletions(-)
---