[kdesdk/f14/master: 21/21] Merge remote-tracking branch 'origin/master' into f14

[Jaroslav Reznik]

commit c591c5bdc5932f93f025b7e2514777648c8b2c4a
Merge: 643d801 7482652
Author: Jaroslav Reznik <jreznik at redhat.com>
Date:   Wed Mar 16 15:34:48 2011 +0100

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

 .gitignore  |    2 +-
 kdesdk.spec |  103 ++++++++++++++++++++++++++++++++++++----------------------
 sources     |    2 +-
 3 files changed, 66 insertions(+), 41 deletions(-)
---