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

[Rex Dieter]

commit b411b560947ba03b876d7e85bf9abd3a3bbbdae0
Merge: 2856270 2948a75
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Jul 1 13:26:09 2011 -0500

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

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