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

[Rex Dieter]

commit 8a7e567d31ae70c8f3380de13a79ef966cca7027
Merge: 56021b7 a6390ea
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sun Oct 3 05:54:03 2010 -0500

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

 .gitignore      |    2 +-
 kdeartwork.spec |   16 +++++-----------
 sources         |    2 +-
 3 files changed, 7 insertions(+), 13 deletions(-)
---