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

[Lukas Tinkl]

commit ba04c6bf1fcdb387c87e9cbed56d2856e254ebbc
Merge: eb48fe8 96881cd
Author: Lukas Tinkl <lukas at kde.org>
Date:   Tue Sep 18 18:28:51 2012 +0200

    Merge remote-tracking branch 'origin/master' into f17

 kde-workspace-4.9.2-devicenotifier-freespace.patch |   43 ++++++++++++++++++++
 kde-workspace.spec                                 |   10 ++++-
 powerdevil-systemd-policyagent.patch               |   13 +++---
 3 files changed, 57 insertions(+), 9 deletions(-)
---