[kdesdk/f14/master: 4/4] Merge branch 'master' into f14

[Rex Dieter]

commit 22afa2f318d0ee45071ea67d3c45f3285f0c636c
Merge: c002843 3aba30f
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sun Aug 29 14:59:47 2010 -0500

    Merge branch 'master' into f14
    
    Conflicts:
    	.gitignore
    	kdesdk.spec
    	sources

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