[kdesdk/f14/master: 2/2] Merge remote-tracking branch 'origin/master' into f14

[Rex Dieter]

commit 57be252a3925f3229575f7cdc552c1f171f6371e
Merge: c591c5b 628e925
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Apr 9 09:22:11 2011 -0500

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

 .gitignore  |    1 +
 kdesdk.spec |    5 ++++-
 sources     |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---