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

[Rex Dieter]

commit e15aff94b728e278945e19fda57a5db3ed5bd70c
Merge: 82ea80f eb14569
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Mar 30 14:31:50 2012 -0500

    Merge branch 'master' into f16

 kdesdk-4.8.2-script_permissions.patch |   13 +++++++++++++
 kdesdk.spec                           |    3 +++
 2 files changed, 16 insertions(+), 0 deletions(-)
---