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

[Rex Dieter]

commit 25a6932b8f529d9ab1d7233847fd02dfc4f5e07b
Merge: 47564af 643d801
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Jan 6 10:45:45 2011 -0600

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

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