[kdeartwork/f14/master: 4/4] Merge branch 'master' into f14

[Rex Dieter]

commit 56021b73cdb4a6e735d54767e3ce90add8cab81a
Merge: 5444d2d 9650efd
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sun Aug 29 13:46:52 2010 -0500

    Merge branch 'master' into f14
    
    Conflicts:
    	.gitignore
    	kdeartwork.spec
    	sources

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