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

[Rex Dieter]

commit 82ea80f0df3f6f519135dbadfac37ff9cdb1b3b8
Merge: 4ee9487 9749897
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Mar 30 14:00:34 2012 -0500

    Merge branch 'master' into f16

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