[kdeartwork/f13/master: 3/3] Merge remote branch 'origin/f14/master' into f13/master

[Rex Dieter]

commit 8d1a9aa00611b04a89378bb11424990232f836fb
Merge: 83aee32 829e303
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Jan 6 10:24:47 2011 -0600

    Merge remote branch 'origin/f14/master' into f13/master

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