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

[Lukas Tinkl]

commit 7d54ed75cd936e0b426e977f4878421b22284e46
Merge: f6e9587 e88fecf
Author: Lukas Tinkl <lukas at kde.org>
Date:   Fri Jul 20 14:55:40 2012 +0200

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

 apper-conserve-resources.patch |   21 +++++++++++++++++++++
 apper.spec                     |    7 ++++++-
 2 files changed, 27 insertions(+), 1 deletions(-)
---