[apper/f16: 3/3] Merge remote-tracking branch 'origin/master' into f16

[Lukas Tinkl]

commit f1e6894e34b8f72d1f4204072f39d5e3aa8ed5d9
Merge: ff71671 fb8bdf1
Author: Lukas Tinkl <lukas at kde.org>
Date:   Wed May 9 15:50:08 2012 +0200

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

 apper-0.7.1-observe-battery.patch |   26 ++++++++++++++++++++++++++
 apper.spec                        |   11 ++++++++++-
 2 files changed, 36 insertions(+), 1 deletions(-)
---