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

[Rex Dieter]

commit 2c0a94fff4a7df4ae1257006b42bb4f274a71f34
Merge: f0b2e2b fd9fc9e
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Oct 22 09:05:17 2010 -0500

    Merge remote branch 'origin/master' into f13/master
    
    Conflicts:
    	.gitignore
    	kdesdk.spec
    	sources

 .gitignore  |    2 +-
 kdesdk.spec |   52 +++++++++++++++++++++++++++++++++++++---------------
 sources     |    2 +-
 3 files changed, 39 insertions(+), 17 deletions(-)
---