[kdepimlibs/f14: 2/2] Merge branch 'f15' into f14

[Than Ngo]

commit eb5ffb670c413132cb756adb479ebcf5f7893724
Merge: 760ca88 602b151
Author: Than Ngo <than at redhat.com>
Date:   Thu Jun 9 16:22:05 2011 +0200

    Merge branch 'f15' into f14

 .gitignore      |    1 +
 kdepimlibs.spec |    5 ++++-
 sources         |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---