[kdesdk/f14/master: 3/3] Merge remote branch 'origin/master' into f14/master

[Rex Dieter]

commit de861640eb7d7bcee2ccc3fe474c8b39e2d4c43c
Merge: 22afa2f fd9fc9e
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sun Oct 3 05:55:42 2010 -0500

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

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