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

[Jaroslav Reznik]

commit 8e49ed9d2d4d88557dab932cd1c6e96abb098c17
Merge: 4093c0b 63060c4
Author: Jaroslav Reznik <jreznik at redhat.com>
Date:   Mon Mar 12 16:30:46 2012 +0100

    Merge branch 'master' into f16

 kdepim-runtime-4.8.1-fix-version.patch |   12 ++++++++++++
 kdepim-runtime.spec                    |    9 +++++++--
 2 files changed, 19 insertions(+), 2 deletions(-)
---