[kdepim-runtime/f16: 2/2] Merge remote-tracking branch 'origin/master' into f16

[Lukas Tinkl]

commit ef4b04d97b93019159bc11614d7c3441ba5fc781
Merge: f0152f4 f719295
Author: Lukas Tinkl <lukas at kde.org>
Date:   Tue Apr 3 21:28:03 2012 +0200

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

 kdepim-runtime.spec |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
---