[kdebase/f14: 2/2] Merge branch 'f15' into f14

[Than Ngo]

commit f3fd0a6b9172e67638642aeea06d4809f76896c4
Merge: 546bc96 d58f866
Author: Than Ngo <than at redhat.com>
Date:   Thu Jun 9 15:29:21 2011 +0200

    Merge branch 'f15' into f14

 .gitignore   |    1 +
 kdebase.spec |    7 +++++--
 sources      |    2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)
---