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

[Rex Dieter]

commit 241af1b1493ebff8ff7a3907c612aef222fbcd33
Merge: 6956513 3ead73a
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Mar 30 10:55:43 2012 -0500

    Merge branch 'master' into f16

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