[kdeartwork/f16: 8/8] Merge remote-tracking branch 'origin/f17' into f16

[Rex Dieter]

commit 51ae153b863985e7a111239efe9c86550594c22e
Merge: 35bcedf 5bd5214
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Mar 7 23:29:19 2012 -0600

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

 .gitignore      |    3 +--
 kdeartwork.spec |   49 ++++++++++++++++++++++++++++++++++---------------
 sources         |    2 +-
 3 files changed, 36 insertions(+), 18 deletions(-)
---