[kdeartwork/f16: 2/2] Merge branch 'master' into f16

[Rex Dieter]

commit a18953ad732c656d9eaf7c72de62e0ae3928e728
Merge: 51ae153 5ceff9a
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Mar 30 13:57:47 2012 -0500

    Merge branch 'master' into f16

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