From kde-commits  Tue Feb 01 03:03:03 2011
From: Aaron Seigo <aseigo () kde ! org>
Date: Tue, 01 Feb 2011 03:03:03 +0000
To: kde-commits
Subject: =?utf-8?q?=5Bkde-workspace=5D_/=3A_Merge_branch_=27master=27_of_?=
Message-Id: <20110201030303.33C42A60B0 () git ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=129652942518112

Git commit 53234e7fdc4c3be128e8d56efe816ed76a75c9df by Aaron Seigo.
Committed on 31/01/11 at 22:06.
Pushed by aseigo into branch 'master'.

Merge branch 'master' of git://anongit.kde.org/kde-workspace

I  +2    -11   CMakeLists.txt     
I  +1    -2    cursors/CMakeLists.txt     
I  +1    -2    libs/ksysguard/CMakeLists.txt     
I  +1    -1    plasma/generic/scriptengines/python/CMakeLists.txt     
I  +7    -7    powerdevil/daemon/backends/upower/backlighthelper.cpp     
I  +11   -2    powerdevil/daemon/powerdevilactionpool.cpp     
I  +2    -0    powerdevil/daemon/powerdevilactionpool.h     
I  +33   -20   powerdevil/daemon/powerdevilcore.cpp     

http://commits.kde.org/kde-workspace/53234e7fdc4c3be128e8d56efe816ed76a75c9df