[kde-workspace/f17: 2/2] Merge branch 'master' into f17

[Jan Grulich]

commit ed12d6c1f922844f9c10a5458f8ead70173a5368
Merge: 13a4695 8746ece
Author: Jan Grulich <jgrulich at redhat.com>
Date:   Thu Sep 13 16:20:26 2012 +0200

    Merge branch 'master' into f17

 kde-workspace.spec                   |    8 +-
 powerdevil-systemd-policyagent.patch |  391 ++++++++++++++++++++++++++++++++++
 2 files changed, 398 insertions(+), 1 deletions(-)
---