[kdeartwork/f14: 2/2] Merge remote-tracking branch 'origin/f15' into f14

[Jaroslav Reznik]

commit 4759c103d8ce06adb3354bb32daeff3984509e69
Merge: da0c6fc c802af0
Author: Jaroslav Reznik <jreznik at redhat.com>
Date:   Fri Jul 1 16:27:25 2011 +0200

    Merge remote-tracking branch 'origin/f15' into f14

 .gitignore      |    4 +---
 kdeartwork.spec |    5 ++++-
 sources         |    2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)
---
diff --cc kdeartwork.spec
index 1e82dcd,caad4e5..0b56cd9
--- a/kdeartwork.spec
+++ b/kdeartwork.spec
@@@ -1,5 -1,6 +1,5 @@@
 -
  Name:           kdeartwork
- Version:        4.6.4
+ Version:        4.6.5
  Release:        1%{?dist}
  Summary:        Additional artwork for KDE