[kdebase-runtime/f14: 3/3] Merge remote-tracking branch 'origin/f15' into f14

[Rex Dieter]

commit 8dc428a3a9193377f627eb733f7e52a430790887
Merge: b3e625e 76bcf76
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Jul 1 08:16:54 2011 -0500

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

 .gitignore           |    4 +---
 kdebase-runtime.spec |   12 +++++++-----
 sources              |    2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)
---