[kdesdk/f16: 2/2] Merge branch 'master' into f16

[Jaroslav Reznik]

commit cdca1d3da831f801e6c5573edcbd1fd2bc693a1c
Merge: e15aff9 a8b3d18
Author: Jaroslav Reznik <jreznik at redhat.com>
Date:   Mon Apr 2 14:16:57 2012 +0200

    Merge branch 'master' into f16

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