[kdesdk/f16: 18/18] Merge remote-tracking branch 'origin/f17' into f16

[Rex Dieter]

commit 4ee9487c8945193aa97a7670b377b5b13cb292ac
Merge: 52652a9 5ac01ad
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Mar 7 23:43:08 2012 -0600

    Merge remote-tracking branch 'origin/f17' into f16
    
    Conflicts:
    	.gitignore
    	kdesdk.spec
    	sources

 .gitignore                            |    3 +-
 kdesdk-4.7.0-NO_STRUCTURES_TOOL.patch |   14 -----
 kdesdk.spec                           |  104 ++++++++++++++++++++++-----------
 sources                               |    2 +-
 4 files changed, 71 insertions(+), 52 deletions(-)
---